diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..c145291
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Report a bug encountered while using ERPNext
+labels: bug
+---
+
+<!--
+Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
+
+1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
+    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
+    - For documentation issues, refer to https://github.com/frappe/erpnext_com
+2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+   the original discussion.
+3. When making a bug report, make sure you provide all required information. The easier it is for
+   maintainers to reproduce, the faster it'll be fixed.
+4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
+-->
+
+## Description of the issue
+
+## Context information (for bug reports)
+
+**Output of `bench version`**
+```
+(paste here)
+```
+
+## Steps to reproduce the issue
+
+1.
+2.
+3.
+
+### Observed result
+
+### Expected result
+
+### Stacktrace / full error message
+
+```
+(paste here)
+```
+
+## Additional information
+
+OS version / distribution, `ERPNext` install method, etc.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..6cdad35
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,28 @@
+---
+name: Feature request
+about: Suggest an idea to improve ERPNext
+labels: feature-request
+---
+
+<!--
+Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
+
+1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
+    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
+    - For documentation issues, refer to https://github.com/frappe/erpnext_com
+2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+   the original discussion.
+3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the     greater the drive to make it happen.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/question-about-using-erpnext.md b/.github/ISSUE_TEMPLATE/question-about-using-erpnext.md
new file mode 100644
index 0000000..455c20e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question-about-using-erpnext.md
@@ -0,0 +1,17 @@
+---
+name: Question about using ERPNext
+about: This is not the appropriate channel
+labels: invalid
+---
+
+Please post on our forums:
+
+for questions about using `ERPNext`: https://discuss.erpnext.com
+
+for questions about using the `Frappe Framework`: https://discuss.frappe.io
+
+for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)
+
+For documentation issues, use the [ERPNext Documentation](https://erpnext.com/docs/) or [Frappe Framework Documentation](https://frappe.io/docs/user/en) or the [developer cheetsheet](https://github.com/frappe/frappe/wiki/Developer-Cheatsheet)
+
+> **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.**
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c0e186d..091cf47 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,2 +1,33 @@
-Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
+<!--
 
+Some key notes before you open a PR:
+
+ 1. Select which branch should this PR be merged in?
+ 2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
+ 3. All tests pass locally, UI and Unit tests
+ 4. All business logic and validations must be on the server-side
+ 5. Update necessary Documentation
+ 6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes
+
+
+Also, if you're new here
+
+- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Updating-Documentation
+
+- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md
+
+- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
+
+-->
+
+> Please provide enough information so that others can review your pull request:
+
+<!-- You can skip this if you're fixing a typo or updating existing documentation -->
+
+> Explain the **details** for making this change. What existing problem does the pull request solve?
+
+<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
+
+> Screenshots/GIFs
+
+<!-- Add images/recordings to better visualize the change: expected/current behviour -->
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..46ed437
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
+
+You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
+
+We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.
\ No newline at end of file
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 686d549..d031bc5 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '12.1.6'
+__version__ = '12.1.8'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
index bc07b6d..d098d84 100644
--- a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
+++ b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, json
+from frappe import _
 from frappe.utils import add_to_date, date_diff, getdate, nowdate, get_last_day, formatdate
 from erpnext.accounts.report.general_ledger.general_ledger import execute
 from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
@@ -24,6 +25,9 @@
 	account = filters.get("account")
 	company = filters.get("company")
 
+	if not account and chart:
+		frappe.throw(_("Account is not set for the dashboard chart {0}").format(chart))
+
 	if not to_date:
 		to_date = nowdate()
 	if not from_date:
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 7cca8d2..cccced8 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -117,7 +117,7 @@
 
 			if not parent_acc_name_map: return
 
-			self.create_account_for_child_company(parent_acc_name_map, descendants)
+			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
 		if self.get("__islocal"):
@@ -159,7 +159,7 @@
 			if frappe.db.get_value("GL Entry", {"account": self.name}):
 				frappe.throw(_("Currency can not be changed after making entries using some other currency"))
 
-	def create_account_for_child_company(self, parent_acc_name_map, descendants):
+	def create_account_for_child_company(self, parent_acc_name_map, descendants, parent_acc_name):
 		for company in descendants:
 			if not parent_acc_name_map.get(company):
 				frappe.throw(_("While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA")
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index 4ee5573..dc23b2b 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -160,7 +160,7 @@
 		["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"]
 	]
 
-	for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"]]:
+	for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"], ["_Test Company with perpetual inventory", "TCP1"]]:
 		test_objects = make_test_objects("Account", [{
 				"doctype": "Account",
 				"account_name": account_name,
diff --git a/erpnext/accounts/doctype/coupon_code/__init__.py b/erpnext/accounts/doctype/coupon_code/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/__init__.py
diff --git a/erpnext/accounts/doctype/coupon_code/coupon_code.js b/erpnext/accounts/doctype/coupon_code/coupon_code.js
new file mode 100644
index 0000000..da3a9f8
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/coupon_code.js
@@ -0,0 +1,44 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Coupon Code', {
+	setup: function(frm) {
+		frm.set_query("pricing_rule", function() {
+			return {
+				filters: [
+					["Pricing Rule","coupon_code_based", "=", "1"]
+				]
+			};
+		});
+	},
+	coupon_name:function(frm){
+		if (frm.doc.__islocal===1) {
+			frm.trigger("make_coupon_code");
+		}
+	},
+	coupon_type:function(frm){
+		if (frm.doc.__islocal===1) {
+			frm.trigger("make_coupon_code");
+		}
+	},
+	make_coupon_code: function(frm) {
+		var coupon_name=frm.doc.coupon_name;
+		var coupon_code;
+		if (frm.doc.coupon_type=='Gift Card') {
+			coupon_code=Math.random().toString(12).substring(2, 12).toUpperCase();
+		}
+		else if(frm.doc.coupon_type=='Promotional'){
+			coupon_name=coupon_name.replace(/\s/g,'');
+			coupon_code=coupon_name.toUpperCase().slice(0,8);
+		}
+		frm.doc.coupon_code=coupon_code;
+		frm.refresh_field('coupon_code');
+	},
+	refresh: function(frm) {
+		if (frm.doc.pricing_rule) {
+			frm.add_custom_button(__("Add/Edit Coupon Conditions"), function(){
+				frappe.set_route("Form", "Pricing Rule", frm.doc.pricing_rule);
+			});
+		}
+	}
+});
diff --git a/erpnext/accounts/doctype/coupon_code/coupon_code.json b/erpnext/accounts/doctype/coupon_code/coupon_code.json
new file mode 100644
index 0000000..7dc5e9d
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/coupon_code.json
@@ -0,0 +1,177 @@
+{
+ "allow_import": 1,
+ "autoname": "field:coupon_name",
+ "creation": "2018-01-22 14:34:39.701832",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "coupon_name",
+  "coupon_type",
+  "customer",
+  "column_break_4",
+  "coupon_code",
+  "pricing_rule",
+  "uses",
+  "valid_from",
+  "valid_upto",
+  "maximum_use",
+  "used",
+  "column_break_11",
+  "description",
+  "amended_from"
+ ],
+ "fields": [
+  {
+   "description": "e.g. \"Summer Holiday 2019 Offer 20\"",
+   "fieldname": "coupon_name",
+   "fieldtype": "Data",
+   "label": "Coupon Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "coupon_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Coupon Type",
+   "options": "Promotional\nGift Card",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval: doc.coupon_type == \"Gift Card\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "label": "Customer",
+   "options": "Customer"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "description": "unique e.g. SAVE20  To be used to get discount",
+   "fieldname": "coupon_code",
+   "fieldtype": "Data",
+   "label": "Coupon Code",
+   "no_copy": 1,
+   "set_only_once": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "pricing_rule",
+   "fieldtype": "Link",
+   "label": "Pricing Rule",
+   "options": "Pricing Rule",
+   "reqd": 1
+  },
+  {
+   "fieldname": "uses",
+   "fieldtype": "Section Break",
+   "label": "Validity and Usage"
+  },
+  {
+   "fieldname": "valid_from",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Valid From"
+  },
+  {
+   "fieldname": "valid_upto",
+   "fieldtype": "Date",
+   "label": "Valid Upto"
+  },
+  {
+   "depends_on": "eval: doc.coupon_type == \"Promotional\"",
+   "fieldname": "maximum_use",
+   "fieldtype": "Int",
+   "label": "Maximum Use"
+  },
+  {
+   "default": "0",
+   "fieldname": "used",
+   "fieldtype": "Int",
+   "label": "Used",
+   "no_copy": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "label": "Coupon Description"
+  },
+  {
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Coupon Code",
+   "print_hide": 1,
+   "read_only": 1
+  }
+ ],
+ "modified": "2019-10-19 14:48:14.602481",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Coupon Code",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Website Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "coupon_name",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/coupon_code/coupon_code.py b/erpnext/accounts/doctype/coupon_code/coupon_code.py
new file mode 100644
index 0000000..7829c93
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/coupon_code.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import (strip)
+class CouponCode(Document):
+	def autoname(self):
+		self.coupon_name = strip(self.coupon_name)
+		self.name = self.coupon_name
+
+		if not self.coupon_code:
+			if self.coupon_type == "Promotional":
+				self.coupon_code =''.join([i for i in self.coupon_name if not i.isdigit()])[0:8].upper()
+			elif self.coupon_type == "Gift Card":
+				self.coupon_code = frappe.generate_hash()[:10].upper()
+		
+	def validate(self):
+		if self.coupon_type == "Gift Card":
+			self.maximum_use = 1
+			if not self.customer:
+				frappe.throw(_("Please select the customer."))
diff --git a/erpnext/accounts/doctype/coupon_code/test_coupon_code.js b/erpnext/accounts/doctype/coupon_code/test_coupon_code.js
new file mode 100644
index 0000000..460fedc
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/test_coupon_code.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Coupon Code", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Coupon Code
+		() => frappe.tests.make('Coupon Code', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/coupon_code/test_coupon_code.py b/erpnext/accounts/doctype/coupon_code/test_coupon_code.py
new file mode 100644
index 0000000..990b896
--- /dev/null
+++ b/erpnext/accounts/doctype/coupon_code/test_coupon_code.py
@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+from erpnext.stock.get_item_details import get_item_details
+from frappe.test_runner import make_test_objects
+
+def test_create_test_data():
+	frappe.set_user("Administrator")
+	# create test item
+	if not frappe.db.exists("Item","_Test Tesla Car"):
+		item = frappe.get_doc({
+		"description": "_Test Tesla Car",
+		"doctype": "Item",
+		"has_batch_no": 0,
+		"has_serial_no": 0,
+		"inspection_required": 0,
+		"is_stock_item": 1,
+		"opening_stock":100,
+		"is_sub_contracted_item": 0,
+		"item_code": "_Test Tesla Car",
+		"item_group": "_Test Item Group",
+		"item_name": "_Test Tesla Car",
+		"apply_warehouse_wise_reorder_level": 0,
+		"warehouse":"_Test Warehouse - _TC",
+		"gst_hsn_code": "999800",
+		"valuation_rate": 5000,
+		"standard_rate":5000,
+		"item_defaults": [{
+		"company": "_Test Company",
+		"default_warehouse": "_Test Warehouse - _TC",
+		"default_price_list":"_Test Price List",
+		"expense_account": "_Test Account Cost for Goods Sold - _TC",
+		"buying_cost_center": "_Test Cost Center - _TC",
+		"selling_cost_center": "_Test Cost Center - _TC",
+		"income_account": "Sales - _TC"
+		}],
+		"show_in_website": 1,
+		"route":"-test-tesla-car",
+		"website_warehouse": "_Test Warehouse - _TC"
+		})
+		item.insert()
+	# create test item price
+	item_price = frappe.get_list('Item Price', filters={'item_code': '_Test Tesla Car', 'price_list': '_Test Price List'}, fields=['name'])
+	if len(item_price)==0:
+		item_price = frappe.get_doc({
+			"doctype": "Item Price",
+			"item_code": "_Test Tesla Car",
+			"price_list": "_Test Price List",
+			"price_list_rate": 5000
+		})
+		item_price.insert()
+	# create test item pricing rule
+	if not frappe.db.exists("Pricing Rule","_Test Pricing Rule for _Test Item"):
+		item_pricing_rule = frappe.get_doc({
+		"doctype": "Pricing Rule",
+		"title": "_Test Pricing Rule for _Test Item",
+		"apply_on": "Item Code",
+		"items": [{
+			"item_code": "_Test Tesla Car"
+		}],
+		"warehouse":"_Test Warehouse - _TC",
+		"coupon_code_based":1,
+		"selling": 1,
+		"rate_or_discount": "Discount Percentage",
+		"discount_percentage": 30,
+		"company": "_Test Company",
+		"currency":"INR",
+		"for_price_list":"_Test Price List"
+		})
+		item_pricing_rule.insert()
+	# create test item sales partner
+	if not frappe.db.exists("Sales Partner","_Test Coupon Partner"):
+		sales_partner = frappe.get_doc({
+		"doctype": "Sales Partner",
+		"partner_name":"_Test Coupon Partner",
+		"commission_rate":2,
+		"referral_code": "COPART"
+		})
+		sales_partner.insert()
+	# create test item coupon code
+	if not frappe.db.exists("Coupon Code","SAVE30"):
+		coupon_code = frappe.get_doc({
+		"doctype": "Coupon Code",
+		"coupon_name":"SAVE30",
+		"coupon_code":"SAVE30",
+		"pricing_rule": "_Test Pricing Rule for _Test Item",
+		"valid_from": "2014-01-01",
+		"maximum_use":1,
+		"used":0
+		})
+		coupon_code.insert()
+
+
+class TestCouponCode(unittest.TestCase):
+	def setUp(self):
+		test_create_test_data()
+
+	def tearDown(self):
+		frappe.set_user("Administrator")
+
+	def test_1_check_coupon_code_used_before_so(self):
+		coupon_code = frappe.get_doc("Coupon Code", frappe.db.get_value("Coupon Code", {"coupon_name":"SAVE30"}))
+		# reset used coupon code count
+		coupon_code.used=0
+		coupon_code.save()
+		# check no coupon code is used before sales order is made
+		self.assertEqual(coupon_code.get("used"),0)
+
+	def test_2_sales_order_with_coupon_code(self):
+		so = make_sales_order(customer="_Test Customer",selling_price_list="_Test Price List",item_code="_Test Tesla Car", rate=5000,qty=1, do_not_submit=True)
+		so = frappe.get_doc('Sales Order', so.name)
+		# check item price before coupon code is applied
+		self.assertEqual(so.items[0].rate, 5000)
+		so.coupon_code='SAVE30'
+		so.sales_partner='_Test Coupon Partner'
+		so.save()
+		# check item price after coupon code is applied
+		self.assertEqual(so.items[0].rate, 3500)	
+		so.submit()
+
+	def test_3_check_coupon_code_used_after_so(self):
+		doc = frappe.get_doc("Coupon Code", frappe.db.get_value("Coupon Code", {"coupon_name":"SAVE30"}))
+		# check no coupon code is used before sales order is made
+		self.assertEqual(doc.get("used"),1)
+
+
+
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 5d88bfa..11d847d 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -608,15 +608,9 @@
 	},
 
 	account_query: function(frm) {
-		var inter_company = 0;
-		if (frm.doc.voucher_type == "Inter Company Journal Entry") {
-			inter_company = 1;
-		}
-
 		var filters = {
 			company: frm.doc.company,
-			is_group: 0,
-			inter_company_account: inter_company
+			is_group: 0
 		};
 		if(!frm.doc.multi_currency) {
 			$.extend(filters, {
diff --git a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
index 4a7406e..341884c 100644
--- a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
+++ b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
@@ -8,10 +8,12 @@
 from frappe.utils import today, cint, flt, getdate
 from erpnext.accounts.doctype.loyalty_program.loyalty_program import get_loyalty_program_details_with_points
 from erpnext.accounts.party import get_dashboard_info
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 
 class TestLoyaltyProgram(unittest.TestCase):
 	@classmethod
 	def setUpClass(self):
+		set_perpetual_inventory(0)
 		# create relevant item, customer, loyalty program, etc
 		create_records()
 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 172d537..1e0b1bc 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -308,7 +308,7 @@
 							() => {
 								frm.set_party_account_based_on_party = false;
 								if (r.message.bank_account) {
-									frm.set_value("bank_account", r.message.bank_account);
+									frm.set_value("party_bank_account", r.message.bank_account);
 								}
 							}
 						]);
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 0210212..971d308 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -1,2627 +1,616 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:title", 
- "beta": 0, 
- "creation": "2014-02-21 15:02:51", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:title",
+ "creation": "2014-02-21 15:02:51",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "applicability_section",
+  "title",
+  "disable",
+  "apply_on",
+  "price_or_product_discount",
+  "warehouse",
+  "column_break_7",
+  "items",
+  "item_groups",
+  "brands",
+  "mixed_conditions",
+  "is_cumulative",
+  "coupon_code_based",
+  "section_break_18",
+  "apply_rule_on_other",
+  "column_break_17",
+  "other_item_code",
+  "other_item_group",
+  "other_brand",
+  "section_break_7",
+  "selling",
+  "buying",
+  "column_break_11",
+  "applicable_for",
+  "customer",
+  "customer_group",
+  "territory",
+  "sales_partner",
+  "campaign",
+  "supplier",
+  "supplier_group",
+  "section_break_19",
+  "min_qty",
+  "max_qty",
+  "column_break_21",
+  "min_amt",
+  "max_amt",
+  "section_break_23",
+  "valid_from",
+  "valid_upto",
+  "col_break1",
+  "company",
+  "currency",
+  "margin",
+  "margin_type",
+  "column_break_33",
+  "margin_rate_or_amount",
+  "price_discount_scheme_section",
+  "rate_or_discount",
+  "apply_discount_on",
+  "col_break2",
+  "rate",
+  "discount_amount",
+  "discount_percentage",
+  "for_price_list",
+  "product_discount_scheme_section",
+  "same_item",
+  "free_item",
+  "free_qty",
+  "column_break_51",
+  "free_item_uom",
+  "free_item_rate",
+  "section_break_13",
+  "threshold_percentage",
+  "priority",
+  "column_break_66",
+  "apply_multiple_pricing_rules",
+  "apply_discount_on_rate",
+  "validate_applied_rule",
+  "rule_description",
+  "help_section",
+  "pricing_rule_help",
+  "reference_section",
+  "promotional_scheme_id",
+  "promotional_scheme"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "applicability_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "applicability_section",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "no_copy": 1,
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "disable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Disable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "disable",
+   "fieldtype": "Check",
+   "label": "Disable"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Item Code", 
-   "fetch_if_empty": 0, 
-   "fieldname": "apply_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Apply On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nItem Code\nItem Group\nBrand\nTransaction", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Item Code",
+   "fieldname": "apply_on",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Apply On",
+   "options": "\nItem Code\nItem Group\nBrand\nTransaction",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "price_or_product_discount", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price or Product Discount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Price\nProduct", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "price_or_product_discount",
+   "fieldtype": "Select",
+   "label": "Price or Product Discount",
+   "options": "Price\nProduct",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on != 'Transaction'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_on != 'Transaction'",
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "label": "Warehouse",
+   "options": "Warehouse",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_7", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on == 'Item Code'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "items", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Rule On Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule Item Code", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_on == 'Item Code'",
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "label": "Apply Rule On Item Code",
+   "options": "Pricing Rule Item Code"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on == 'Item Group'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_groups", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Rule On Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule Item Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_on == 'Item Group'",
+   "fieldname": "item_groups",
+   "fieldtype": "Table",
+   "label": "Apply Rule On Item Group",
+   "options": "Pricing Rule Item Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on == 'Brand'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "brands", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Rule On Brand", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule Brand", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_on == 'Brand'",
+   "fieldname": "brands",
+   "fieldtype": "Table",
+   "label": "Apply Rule On Brand",
+   "options": "Pricing Rule Brand"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on != 'Transaction'", 
-   "description": "Conditions will be applied on all the selected items combined. ", 
-   "fetch_if_empty": 0, 
-   "fieldname": "mixed_conditions", 
-   "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": "Mixed Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.apply_on != 'Transaction'",
+   "description": "Conditions will be applied on all the selected items combined. ",
+   "fieldname": "mixed_conditions",
+   "fieldtype": "Check",
+   "label": "Mixed Conditions"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "is_cumulative", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Cumulative", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "is_cumulative",
+   "fieldtype": "Check",
+   "label": "Is Cumulative"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_on != 'Transaction'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_18", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Discount on Other Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "coupon_code_based",
+   "fieldtype": "Check",
+   "label": "Coupon Code Based"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "apply_rule_on_other", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Rule On Other", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nItem Code\nItem Group\nBrand", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "depends_on": "eval:doc.apply_on != 'Transaction'",
+   "fieldname": "section_break_18",
+   "fieldtype": "Section Break",
+   "label": "Discount on Other Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_17", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "apply_rule_on_other",
+   "fieldtype": "Select",
+   "label": "Apply Rule On Other",
+   "options": "\nItem Code\nItem Group\nBrand"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_rule_on_other == 'Item Code'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "other_item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_rule_on_other == 'Item Group'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "other_item_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_rule_on_other == 'Item Code'",
+   "fieldname": "other_item_code",
+   "fieldtype": "Link",
+   "label": "Item Code",
+   "options": "Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.apply_rule_on_other == 'Brand'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "other_brand", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Brand", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Brand", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_rule_on_other == 'Item Group'",
+   "fieldname": "other_item_group",
+   "fieldtype": "Link",
+   "label": "Item Group",
+   "options": "Item Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Party Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.apply_rule_on_other == 'Brand'",
+   "fieldname": "other_brand",
+   "fieldtype": "Link",
+   "label": "Brand",
+   "options": "Brand"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "selling", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Selling", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break",
+   "label": "Party Information"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "buying", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Buying", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "selling",
+   "fieldtype": "Check",
+   "label": "Selling"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_11", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "buying",
+   "fieldtype": "Check",
+   "label": "Buying"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.buying || doc.selling", 
-   "fetch_if_empty": 0, 
-   "fieldname": "applicable_for", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Applicable For", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Customer\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval: doc.buying || doc.selling",
+   "fieldname": "applicable_for",
+   "fieldtype": "Select",
+   "label": "Applicable For",
+   "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Customer Group\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Customer\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "label": "Customer",
+   "options": "Customer"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Territory\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Customer Group\"",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "label": "Customer Group",
+   "options": "Customer Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Sales Partner\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "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 Partner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Partner", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Territory\"",
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "label": "Territory",
+   "options": "Territory"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Campaign\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "campaign", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Campaign", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Campaign", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Sales Partner\"",
+   "fieldname": "sales_partner",
+   "fieldtype": "Link",
+   "label": "Sales Partner",
+   "options": "Sales Partner"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Supplier\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Campaign\"",
+   "fieldname": "campaign",
+   "fieldtype": "Link",
+   "label": "Campaign",
+   "options": "Campaign"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.applicable_for==\"Supplier Group\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "supplier_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Supplier\"",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "label": "Supplier",
+   "options": "Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_19", 
-   "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": "Quantity and Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.applicable_for==\"Supplier Group\"",
+   "fieldname": "supplier_group",
+   "fieldtype": "Link",
+   "label": "Supplier Group",
+   "options": "Supplier Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "min_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Min Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_19",
+   "fieldtype": "Section Break",
+   "label": "Quantity and Amount"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "max_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "min_qty",
+   "fieldtype": "Float",
+   "label": "Min Qty"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_21", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "max_qty",
+   "fieldtype": "Float",
+   "label": "Max Qty"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fetch_if_empty": 0, 
-   "fieldname": "min_amt", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Min Amt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_21",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fetch_if_empty": 0, 
-   "fieldname": "max_amt", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Amt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "min_amt",
+   "fieldtype": "Currency",
+   "label": "Min Amt",
+   "options": "currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_23", 
-   "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": "Period Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "max_amt",
+   "fieldtype": "Currency",
+   "label": "Max Amt",
+   "options": "currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fetch_if_empty": 0, 
-   "fieldname": "valid_from", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Valid From", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_23",
+   "fieldtype": "Section Break",
+   "label": "Period Settings"
+  },
+  {
+   "default": "Today",
+   "fieldname": "valid_from",
+   "fieldtype": "Date",
+   "label": "Valid From"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "valid_upto", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Valid Upto", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "valid_upto",
+   "fieldtype": "Date",
+   "label": "Valid Upto"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "currency", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "label": "Currency",
+   "options": "Currency",
+   "print_hide": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.selling == 1", 
-   "fetch_if_empty": 0, 
-   "fieldname": "margin", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval: doc.selling == 1",
+   "fieldname": "margin",
+   "fieldtype": "Section Break",
+   "label": "Margin"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Percentage", 
-   "fetch_if_empty": 0, 
-   "fieldname": "margin_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nPercentage\nAmount", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Percentage",
+   "fieldname": "margin_type",
+   "fieldtype": "Select",
+   "label": "Margin Type",
+   "options": "\nPercentage\nAmount"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_33", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_33",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "depends_on": "eval:doc.margin_type", 
-   "fetch_if_empty": 0, 
-   "fieldname": "margin_rate_or_amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Rate or Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.margin_type",
+   "fieldname": "margin_rate_or_amount",
+   "fieldtype": "Float",
+   "label": "Margin Rate or Amount"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.price_or_product_discount == 'Price'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "price_discount_scheme_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Price Discount Scheme", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.price_or_product_discount == 'Price'",
+   "fieldname": "price_discount_scheme_section",
+   "fieldtype": "Section Break",
+   "label": "Price Discount Scheme"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Discount Percentage", 
-   "fetch_if_empty": 0, 
-   "fieldname": "rate_or_discount", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate or Discount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nRate\nDiscount Percentage\nDiscount Amount", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Discount Percentage",
+   "fieldname": "rate_or_discount",
+   "fieldtype": "Select",
+   "label": "Rate or Discount",
+   "options": "\nRate\nDiscount Percentage\nDiscount Amount",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Grand Total", 
-   "depends_on": "eval:doc.apply_on == 'Transaction' && doc.rate_or_discount != 'Rate'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "apply_discount_on", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Discount On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Grand Total\nNet Total", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Grand Total",
+   "depends_on": "eval:doc.apply_on == 'Transaction' && doc.rate_or_discount != 'Rate'",
+   "fieldname": "apply_discount_on",
+   "fieldtype": "Select",
+   "label": "Apply Discount On",
+   "options": "Grand Total\nNet Total"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "col_break2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.rate_or_discount==\"Rate\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.rate_or_discount==\"Rate\"",
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "label": "Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "depends_on": "eval:doc.rate_or_discount==\"Discount Amount\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "discount_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.rate_or_discount==\"Discount Amount\"",
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "label": "Discount Amount",
+   "options": "currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.rate_or_discount==\"Discount Percentage\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Discount Percentage", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.rate_or_discount==\"Discount Percentage\"",
+   "fieldname": "discount_percentage",
+   "fieldtype": "Float",
+   "label": "Discount Percentage"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.rate_or_discount==\"Discount Percentage\"", 
-   "fetch_if_empty": 0, 
-   "fieldname": "for_price_list", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "For Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Price List", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.rate_or_discount!=\"Rate\"",
+   "fieldname": "for_price_list",
+   "fieldtype": "Link",
+   "label": "For Price List",
+   "options": "Price List"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.price_or_product_discount == 'Product'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "product_discount_scheme_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Product Discount Scheme", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.price_or_product_discount == 'Product'",
+   "fieldname": "product_discount_scheme_section",
+   "fieldtype": "Section Break",
+   "label": "Product Discount Scheme"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.mixed_conditions", 
-   "fetch_if_empty": 0, 
-   "fieldname": "same_item", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Same Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:!doc.mixed_conditions",
+   "fieldname": "same_item",
+   "fieldtype": "Check",
+   "label": "Same Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.same_item || doc.mixed_conditions", 
-   "fetch_if_empty": 0, 
-   "fieldname": "free_item", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Free Item", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:!doc.same_item || doc.mixed_conditions",
+   "fieldname": "free_item",
+   "fieldtype": "Link",
+   "label": "Free Item",
+   "options": "Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "free_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "free_qty",
+   "fieldtype": "Float",
+   "label": "Qty"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_51", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_51",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "free_item_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "free_item_uom",
+   "fieldtype": "Link",
+   "label": "UOM",
+   "options": "UOM"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "free_item_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "free_item_rate",
+   "fieldtype": "Currency",
+   "label": "Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_13", 
-   "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": "Advanced Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "section_break_13",
+   "fieldtype": "Section Break",
+   "label": "Advanced Settings"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "System will notify to increase or decrease quantity or amount ", 
-   "fetch_if_empty": 0, 
-   "fieldname": "threshold_percentage", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Threshold for Suggestion", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "description": "System will notify to increase or decrease quantity or amount ",
+   "fieldname": "threshold_percentage",
+   "fieldtype": "Percent",
+   "label": "Threshold for Suggestion"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Higher the number, higher the priority", 
-   "fetch_if_empty": 0, 
-   "fieldname": "priority", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Priority", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "description": "Higher the number, higher the priority",
+   "fieldname": "priority",
+   "fieldtype": "Select",
+   "label": "Priority",
+   "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_66", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_66",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "apply_multiple_pricing_rules", 
-   "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": "Apply Multiple Pricing Rules", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "apply_multiple_pricing_rules",
+   "fieldtype": "Check",
+   "label": "Apply Multiple Pricing Rules"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:in_list(['Discount Percentage', 'Discount Amount'], doc.rate_or_discount) && doc.apply_multiple_pricing_rules", 
-   "fetch_if_empty": 0, 
-   "fieldname": "apply_discount_on_rate", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Apply Discount on Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:in_list(['Discount Percentage', 'Discount Amount'], doc.rate_or_discount) && doc.apply_multiple_pricing_rules",
+   "fieldname": "apply_discount_on_rate",
+   "fieldtype": "Check",
+   "label": "Apply Discount on Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.price_or_product_discount == 'Price'", 
-   "description": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "validate_applied_rule", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Validate Applied Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.price_or_product_discount == 'Price'",
+   "fieldname": "validate_applied_rule",
+   "fieldtype": "Check",
+   "label": "Validate Applied Rule"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "validate_applied_rule", 
-   "fetch_if_empty": 0, 
-   "fieldname": "rule_description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rule Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "validate_applied_rule",
+   "fieldname": "rule_description",
+   "fieldtype": "Small Text",
+   "label": "Rule Description"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "help_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Simple", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "help_section",
+   "fieldtype": "Section Break",
+   "options": "Simple"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "pricing_rule_help", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Pricing Rule Help", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "pricing_rule_help",
+   "fieldtype": "HTML",
+   "label": "Pricing Rule Help"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "reference_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reference_section",
+   "fieldtype": "Section Break",
+   "hidden": 1,
+   "label": "Reference"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "promotional_scheme_id", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Promotional Scheme Id", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "promotional_scheme_id",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Promotional Scheme Id",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "promotional_scheme", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Promotional Scheme", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Promotional Scheme", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "promotional_scheme",
+   "fieldtype": "Link",
+   "label": "Promotional Scheme",
+   "options": "Promotional Scheme"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-gift", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-03-25 13:20:11.773190", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Pricing Rule", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-gift",
+ "idx": 1,
+ "modified": "2019-10-15 12:39:40.399792",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Pricing Rule",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "export": 1,
+   "import": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Website Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Website Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 0, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "export": 1,
+   "import": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index a94d127..1776275 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -249,6 +249,9 @@
 			if pricing_rule.mixed_conditions or pricing_rule.apply_rule_on_other:
 				continue
 
+			if pricing_rule.coupon_code_based==1 and args.coupon_code==None:
+				return item_details
+				
 			if (not pricing_rule.validate_applied_rule and
 				pricing_rule.price_or_product_discount == "Price"):
 				apply_price_discount_pricing_rule(pricing_rule, item_details, args)
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index bbabac4..ef26c2e 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -531,4 +531,32 @@
 	for d in doc.get("items"):
 		validate_pricing_rule_on_items(doc, d, True)
 
-	return doc
\ No newline at end of file
+	return doc
+
+def validate_coupon_code(coupon_name):
+	from frappe.utils import today,getdate
+	coupon=frappe.get_doc("Coupon Code",coupon_name)
+	if coupon.valid_from:
+		if coupon.valid_from > getdate(today()) :
+			frappe.throw(_("Sorry,coupon code validity has not started"))
+	elif coupon.valid_upto:
+		if coupon.valid_upto < getdate(today()) :
+			frappe.throw(_("Sorry,coupon code validity has expired"))	
+	elif coupon.used>=coupon.maximum_use:
+		frappe.throw(_("Sorry,coupon code are exhausted"))
+	else:
+		return
+
+def update_coupon_code_count(coupon_name,transaction_type):
+	coupon=frappe.get_doc("Coupon Code",coupon_name)
+	if coupon:
+		if transaction_type=='used':
+			if coupon.used<coupon.maximum_use:
+				coupon.used=coupon.used+1
+				coupon.save(ignore_permissions=True)
+			else:
+				frappe.throw(_("{0} Coupon used are {1}. Allowed quantity is exhausted").format(coupon.coupon_code,coupon.used))
+		elif transaction_type=='cancelled':
+			if coupon.used>0:
+				coupon.used=coupon.used-1
+				coupon.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 6deee38..b2ad4f4 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -10,7 +10,7 @@
 from frappe.utils import cint, flt, today, nowdate, add_days
 import frappe.defaults
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory, \
-	test_records as pr_test_records
+	test_records as pr_test_records, make_purchase_receipt, get_taxes
 from erpnext.controllers.accounts_controller import get_payment_terms
 from erpnext.exceptions import InvalidCurrency
 from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
@@ -57,16 +57,11 @@
 			self.assertEqual([d.debit, d.credit], expected_gl_entries.get(d.account))
 
 	def test_gl_entries_with_perpetual_inventory(self):
-		pi = frappe.copy_doc(test_records[1])
-		set_perpetual_inventory(1, pi.company)
+		pi = make_purchase_invoice(company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1", warehouse= "Stores - TCP1", cost_center = "Main - TCP1", expense_account ="_Test Account Cost for Goods Sold - TCP1", get_taxes_and_charges=True, qty=10)
 		self.assertTrue(cint(erpnext.is_perpetual_inventory_enabled(pi.company)), 1)
-		pi.insert()
-		pi.submit()
 
 		self.check_gle_for_pi(pi.name)
 
-		set_perpetual_inventory(0, pi.company)
-
 	def test_terms_added_after_save(self):
 		pi = frappe.copy_doc(test_records[1])
 		pi.insert()
@@ -196,21 +191,21 @@
 		self.assertEqual(pi.on_hold, 0)
 
 	def test_gl_entries_with_perpetual_inventory_against_pr(self):
-		pr = frappe.copy_doc(pr_test_records[0])
-		set_perpetual_inventory(1, pr.company)
-		self.assertTrue(cint(erpnext.is_perpetual_inventory_enabled(pr.company)), 1)
-		pr.submit()
 
-		pi = frappe.copy_doc(test_records[1])
-		for d in pi.get("items"):
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1", warehouse= "Stores - TCP1", cost_center = "Main - TCP1", get_taxes_and_charges=True,)
+
+		self.assertTrue(cint(erpnext.is_perpetual_inventory_enabled(pr.company)), 1)
+
+		pi = make_purchase_invoice(company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1", warehouse= "Stores - TCP1", cost_center = "Main - TCP1", expense_account ="_Test Account Cost for Goods Sold - TCP1", get_taxes_and_charges=True, qty=10,do_not_save= "True")
+
+		for d in pi.items:
 			d.purchase_receipt = pr.name
+
 		pi.insert()
 		pi.submit()
 
 		self.check_gle_for_pi(pi.name)
 
-		set_perpetual_inventory(0, pr.company)
-
 	def check_gle_for_pi(self, pi):
 		gl_entries = frappe.db.sql("""select account, debit, credit
 			from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
@@ -218,10 +213,10 @@
 		self.assertTrue(gl_entries)
 
 		expected_values = dict((d[0], d) for d in [
-			["_Test Payable - _TC", 0, 720],
-			["Stock Received But Not Billed - _TC", 500.0, 0],
-			["_Test Account Shipping Charges - _TC", 100.0, 0],
-			["_Test Account VAT - _TC", 120.0, 0],
+			["Creditors - TCP1", 0, 720],
+			["Stock Received But Not Billed - TCP1", 500.0, 0],
+			["_Test Account Shipping Charges - TCP1", 100.0, 0],
+			["_Test Account VAT - TCP1", 120.0, 0],
 		])
 
 		for i, gle in enumerate(gl_entries):
@@ -524,10 +519,9 @@
 		self.assertFalse(gle)
 
 	def test_purchase_invoice_update_stock_gl_entry_with_perpetual_inventory(self):
-		set_perpetual_inventory()
 
 		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
-			posting_time=frappe.utils.nowtime())
+			posting_time=frappe.utils.nowtime(), cash_bank_account="Cash - TCP1", company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1", warehouse= "Stores - TCP1", cost_center = "Main - TCP1", expense_account ="_Test Account Cost for Goods Sold - TCP1")
 
 		gl_entries = frappe.db.sql("""select account, account_currency, debit, credit,
 			debit_in_account_currency, credit_in_account_currency
@@ -548,9 +542,9 @@
 			self.assertEqual(expected_gl_entries[gle.account][2], gle.credit)
 
 	def test_purchase_invoice_for_is_paid_and_update_stock_gl_entry_with_perpetual_inventory(self):
-		set_perpetual_inventory()
+
 		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
-			posting_time=frappe.utils.nowtime(), cash_bank_account="Cash - _TC", is_paid=1)
+			posting_time=frappe.utils.nowtime(), cash_bank_account="Cash - TCP1", is_paid=1, company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1", warehouse= "Stores - TCP1", cost_center = "Main - TCP1", expense_account ="_Test Account Cost for Goods Sold - TCP1")
 
 		gl_entries = frappe.db.sql("""select account, account_currency, sum(debit) as debit,
 				sum(credit) as credit, debit_in_account_currency, credit_in_account_currency
@@ -563,7 +557,7 @@
 		expected_gl_entries = dict((d[0], d) for d in [
 			[pi.credit_to, 250.0, 250.0],
 			[stock_in_hand_account, 250.0, 0.0],
-			["Cash - _TC", 0.0, 250.0]
+			["Cash - TCP1", 0.0, 250.0]
 		])
 
 		for i, gle in enumerate(gl_entries):
@@ -630,6 +624,7 @@
 		self.assertEqual(pi.get("items")[0].rm_supp_cost, flt(rm_supp_cost, 2))
 
 	def test_rejected_serial_no(self):
+		set_perpetual_inventory(0)
 		pi = make_purchase_invoice(item_code="_Test Serialized Item With Series", received_qty=2, qty=1,
 			rejected_qty=1, rate=500, update_stock=1,
 			rejected_warehouse = "_Test Rejected Warehouse - _TC")
@@ -881,7 +876,7 @@
 	pi.is_return = args.is_return
 	pi.return_against = args.return_against
 	pi.is_subcontracted = args.is_subcontracted or "No"
-	pi.supplier_warehouse = "_Test Warehouse 1 - _TC"
+	pi.supplier_warehouse = args.supplier_warehouse or "_Test Warehouse 1 - _TC"
 
 	pi.append("items", {
 		"item_code": args.item or args.item_code or "_Test Item",
@@ -890,14 +885,21 @@
 		"received_qty": args.received_qty or 0,
 		"rejected_qty": args.rejected_qty or 0,
 		"rate": args.rate or 50,
+		'expense_account': args.expense_account or '_Test Account Cost for Goods Sold - _TC',
 		"conversion_factor": 1.0,
 		"serial_no": args.serial_no,
 		"stock_uom": "_Test UOM",
-		"cost_center": "_Test Cost Center - _TC",
+		"cost_center": args.cost_center or "_Test Cost Center - _TC",
 		"project": args.project,
 		"rejected_warehouse": args.rejected_warehouse or "",
 		"rejected_serial_no": args.rejected_serial_no or ""
 	})
+
+	if args.get_taxes_and_charges:
+		taxes = get_taxes()
+		for tax in taxes:
+			pi.append("taxes", tax)
+
 	if not args.do_not_save:
 		pi.insert()
 		if not args.do_not_submit:
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 7d4fc63..ed45b2c 100755
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -402,14 +402,21 @@
 	for docs in doc_list:
 		for name, doc in iteritems(docs):
 			if not frappe.db.exists('Sales Invoice', {'offline_pos_name': name}):
-				validate_records(doc)
-				si_doc = frappe.new_doc('Sales Invoice')
-				si_doc.offline_pos_name = name
-				si_doc.update(doc)
-				si_doc.set_posting_time = 1
-				si_doc.customer = get_customer_id(doc)
-				si_doc.due_date = doc.get('posting_date')
-				name_list = submit_invoice(si_doc, name, doc, name_list)
+				if isinstance(doc, dict):
+					validate_records(doc)
+					si_doc = frappe.new_doc('Sales Invoice')
+					si_doc.offline_pos_name = name
+					si_doc.update(doc)
+					si_doc.set_posting_time = 1
+					si_doc.customer = get_customer_id(doc)
+					si_doc.due_date = doc.get('posting_date')
+					name_list = submit_invoice(si_doc, name, doc, name_list)
+				else:
+					doc.due_date = doc.get('posting_date')
+					doc.customer = get_customer_id(doc)
+					doc.set_posting_time = 1
+					doc.offline_pos_name = name
+					name_list = submit_invoice(doc, name, doc, name_list)
 			else:
 				name_list.append(name)
 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index e1256a7..5766c9a 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -686,7 +686,6 @@
 
 	def make_gl_entries(self, gl_entries=None, repost_future_gle=True, from_repost=False):
 		auto_accounting_for_stock = erpnext.is_perpetual_inventory_enabled(self.company)
-
 		if not gl_entries:
 			gl_entries = self.get_gl_entries()
 
diff --git a/erpnext/accounts/doctype/sales_invoice/test_records.json b/erpnext/accounts/doctype/sales_invoice/test_records.json
index 9c8de7d..ebe6e3d 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_records.json
+++ b/erpnext/accounts/doctype/sales_invoice/test_records.json
@@ -68,8 +68,6 @@
   "selling_price_list": "_Test Price List",
   "territory": "_Test Territory"
  },
- 
- 
  {
   "company": "_Test Company",
   "conversion_rate": 1.0,
@@ -276,7 +274,6 @@
 	  "uom": "_Test UOM 1",
 	  "conversion_factor": 1,
     "stock_uom": "_Test UOM 1"
-	
    },
    {
     "cost_center": "_Test Cost Center - _TC",
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 4f253b6..530bd89 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -20,6 +20,9 @@
 from six import iteritems
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction
 from erpnext.regional.india.utils import get_ewb_data
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
+from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
 
 class TestSalesInvoice(unittest.TestCase):
 	def make(self):
@@ -550,7 +553,6 @@
 		si.get("taxes")[6].tax_amount = 2
 
 		si.insert()
-		print(si.name)
 
 		expected_values = [
 			{
@@ -679,56 +681,67 @@
 		self.assertFalse(gle)
 
 	def test_pos_gl_entry_with_perpetual_inventory(self):
-		set_perpetual_inventory()
 		make_pos_profile()
 
-		self._insert_purchase_receipt()
-		pos = copy.deepcopy(test_records[1])
-		pos["is_pos"] = 1
-		pos["update_stock"] = 1
-		pos["payments"] = [{'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 300},
-							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 300}]
+		pr = make_purchase_receipt(company= "_Test Company with perpetual inventory",supplier_warehouse= "Work In Progress - TCP1", item_code= "_Test FG Item",warehouse= "Stores - TCP1",cost_center= "Main - TCP1")
+
+		pos = create_sales_invoice(company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test FG Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1", do_not_save=True)
+
+		pos.is_pos = 1
+		pos.update_stock = 1
+
+		pos.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - TCP1', 'amount': 50})
+		pos.append("payments", {'mode_of_payment': 'Cash', 'account': 'Cash - TCP1', 'amount': 50})
+
+		taxes = get_taxes_and_charges()
+		pos.taxes = []
+		for tax in taxes:
+			pos.append("taxes", tax)
 
 		si = frappe.copy_doc(pos)
 		si.insert()
 		si.submit()
+		self.assertEqual(si.paid_amount, 100.0)
 
-		self.assertEqual(si.paid_amount, 600.0)
-
-		self.pos_gl_entry(si, pos, 300)
+		self.pos_gl_entry(si, pos, 50)
 
 	def test_pos_change_amount(self):
-		set_perpetual_inventory()
 		make_pos_profile()
 
-		self._insert_purchase_receipt()
-		pos = copy.deepcopy(test_records[1])
-		pos["is_pos"] = 1
-		pos["update_stock"] = 1
-		pos["payments"] = [{'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 300},
-							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 340}]
+		pr = make_purchase_receipt(company= "_Test Company with perpetual inventory",supplier_warehouse= "Work In Progress - TCP1", item_code= "_Test FG Item",warehouse= "Stores - TCP1",cost_center= "Main - TCP1")
 
-		si = frappe.copy_doc(pos)
-		si.change_amount = 5.0
-		si.insert()
-		si.submit()
+		pos = create_sales_invoice(company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test FG Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1", do_not_save=True)
 
-		self.assertEqual(si.grand_total, 630.0)
-		self.assertEqual(si.write_off_amount, -5)
+		pos.is_pos = 1
+		pos.update_stock = 1
+
+		pos.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - TCP1', 'amount': 50})
+		pos.append("payments", {'mode_of_payment': 'Cash', 'account': 'Cash - TCP1', 'amount': 60})
+
+		pos.change_amount = 5.0
+		pos.insert()
+		pos.submit()
+
+		self.assertEqual(pos.grand_total, 100.0)
+		self.assertEqual(pos.write_off_amount, -5)
 
 	def test_make_pos_invoice(self):
 		from erpnext.accounts.doctype.sales_invoice.pos import make_invoice
 
-		set_perpetual_inventory()
-
 		make_pos_profile()
-		self._insert_purchase_receipt()
+		pr = make_purchase_receipt(company= "_Test Company with perpetual inventory",supplier_warehouse= "Work In Progress - TCP1", item_code= "_Test FG Item",warehouse= "Stores - TCP1",cost_center= "Main - TCP1")
+		pos = create_sales_invoice(company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test FG Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1", do_not_save=True)
 
-		pos = copy.deepcopy(test_records[1])
-		pos["is_pos"] = 1
-		pos["update_stock"] = 1
-		pos["payments"] = [{'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 300},
-							{'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 330}]
+		pos.is_pos = 1
+		pos.update_stock = 1
+
+		pos.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - TCP1', 'amount': 50})
+		pos.append("payments", {'mode_of_payment': 'Cash', 'account': 'Cash - TCP1', 'amount': 50})
+
+		taxes = get_taxes_and_charges()
+		pos.taxes = []
+		for tax in taxes:
+			pos.append("taxes", tax)
 
 		invoice_data = [{'09052016142': pos}]
 		si = make_invoice(invoice_data).get('invoice')
@@ -736,16 +749,15 @@
 
 		sales_invoice = frappe.get_all('Sales Invoice', fields =["*"], filters = {'offline_pos_name': '09052016142', 'docstatus': 1})
 		si = frappe.get_doc('Sales Invoice', sales_invoice[0].name)
-		self.assertEqual(si.grand_total, 630.0)
 
-		self.pos_gl_entry(si, pos, 330)
+		self.assertEqual(si.grand_total, 100)
+
+		self.pos_gl_entry(si, pos, 50)
 
 	def test_make_pos_invoice_in_draft(self):
 		from erpnext.accounts.doctype.sales_invoice.pos import make_invoice
 		from erpnext.stock.doctype.item.test_item import make_item
 
-		set_perpetual_inventory()
-
 		allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock')
 		if allow_negative_stock:
 			frappe.db.set_value('Stock Settings', None, 'allow_negative_stock', 0)
@@ -789,7 +801,7 @@
 			si.name, as_dict=1)[0]
 		self.assertTrue(sle)
 		self.assertEqual([sle.item_code, sle.warehouse, sle.actual_qty],
-			["_Test Item", "_Test Warehouse - _TC", -1.0])
+			['_Test FG Item', 'Stores - TCP1', -1.0])
 
 		# check gl entries
 		gl_entries = frappe.db.sql("""select account, debit, credit
@@ -797,19 +809,19 @@
 			order by account asc, debit asc, credit asc""", si.name, as_dict=1)
 		self.assertTrue(gl_entries)
 
-		stock_in_hand = get_inventory_account('_Test Company')
-
+		stock_in_hand = get_inventory_account('_Test Company with perpetual inventory')
 		expected_gl_entries = sorted([
-			[si.debit_to, 630.0, 0.0],
-			[pos["items"][0]["income_account"], 0.0, 500.0],
-			[pos["taxes"][0]["account_head"], 0.0, 80.0],
-			[pos["taxes"][1]["account_head"], 0.0, 50.0],
+			[si.debit_to, 100.0, 0.0],
+			[pos.items[0].income_account, 0.0, 89.09],
+			['Round Off - TCP1', 0.0, 0.01],
+			[pos.taxes[0].account_head, 0.0, 10.69],
+			[pos.taxes[1].account_head, 0.0, 0.21],
 			[stock_in_hand, 0.0, abs(sle.stock_value_difference)],
-			[pos["items"][0]["expense_account"], abs(sle.stock_value_difference), 0.0],
-			[si.debit_to, 0.0, 300.0],
+			[pos.items[0].expense_account, abs(sle.stock_value_difference), 0.0],
+			[si.debit_to, 0.0, 50.0],
 			[si.debit_to, 0.0, cash_amount],
-			["_Test Bank - _TC", 300.0, 0.0],
-			["Cash - _TC", cash_amount, 0.0]
+			["_Test Bank - TCP1", 50, 0.0],
+			["Cash - TCP1", cash_amount, 0.0]
 		])
 
 		for i, gle in enumerate(sorted(gl_entries, key=lambda gle: gle.account)):
@@ -823,9 +835,9 @@
 
 		self.assertFalse(gle)
 
-		set_perpetual_inventory(0)
 
 		frappe.db.sql("delete from `tabPOS Profile`")
+		si.delete()
 
 	def test_pos_si_without_payment(self):
 		set_perpetual_inventory()
@@ -1008,7 +1020,6 @@
 		"""
 		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()
@@ -1023,14 +1034,17 @@
 		self.assertEqual(si.get("items")[0].serial_no, dn.get("items")[0].serial_no)
 
 	def test_return_sales_invoice(self):
-		set_perpetual_inventory()
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
+		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", qty=50, basic_rate=100)
 
-		actual_qty_0 = get_qty_after_transaction()
+		actual_qty_0 = get_qty_after_transaction(item_code = "_Test Item", warehouse = "Stores - TCP1")
 
-		si = create_sales_invoice(qty=5, rate=500, update_stock=1)
+		si = create_sales_invoice(qty = 5, rate=500, update_stock=1, company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1")
 
-		actual_qty_1 = get_qty_after_transaction()
+
+		actual_qty_1 = get_qty_after_transaction(item_code = "_Test Item", warehouse = "Stores - TCP1")
+
+		frappe.db.commit()
+
 		self.assertEqual(actual_qty_0 - 5, actual_qty_1)
 
 		# outgoing_rate
@@ -1038,10 +1052,9 @@
 			"voucher_no": si.name}, "stock_value_difference") / 5
 
 		# return entry
-		si1 = create_sales_invoice(is_return=1, return_against=si.name, qty=-2, rate=500, update_stock=1)
+		si1 = create_sales_invoice(is_return=1, return_against=si.name, qty=-2, rate=500, update_stock=1, company= "_Test Company with perpetual inventory", debit_to="Debtors - TCP1", item_code= "_Test Item", warehouse="Stores - TCP1", income_account = "Sales - TCP1", expense_account = "Cost of Goods Sold - TCP1", cost_center = "Main - TCP1")
 
-		actual_qty_2 = get_qty_after_transaction()
-
+		actual_qty_2 = get_qty_after_transaction(item_code = "_Test Item", warehouse = "Stores - TCP1")
 		self.assertEqual(actual_qty_1 + 2, actual_qty_2)
 
 		incoming_rate, stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
@@ -1049,7 +1062,7 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEqual(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
-		stock_in_hand_account = get_inventory_account('_Test Company', si1.items[0].warehouse)
+		stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory', si1.items[0].warehouse)
 
 		# Check gl entry
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Sales Invoice",
@@ -1058,7 +1071,7 @@
 		self.assertEqual(gle_warehouse_amount, stock_value_difference)
 
 		party_credited = frappe.db.get_value("GL Entry", {"voucher_type": "Sales Invoice",
-			"voucher_no": si1.name, "account": "Debtors - _TC", "party": "_Test Customer"}, "credit")
+			"voucher_no": si1.name, "account": "Debtors - TCP1", "party": "_Test Customer"}, "credit")
 
 		self.assertEqual(party_credited, 1000)
 
@@ -1066,7 +1079,6 @@
 		self.assertFalse(si1.outstanding_amount)
 		self.assertEqual(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"), 1500)
 
-		set_perpetual_inventory(0)
 
 	def test_discount_on_net_total(self):
 		si = frappe.copy_doc(test_records[2])
@@ -1524,6 +1536,8 @@
 		self.assertEqual(si.total_taxes_and_charges, 577.05)
 		self.assertEqual(si.grand_total, 1827.05)
 
+
+
 	def test_create_invoice_without_terms(self):
 		si = create_sales_invoice(do_not_save=1)
 		self.assertFalse(si.get('payment_schedule'))
@@ -1930,4 +1944,29 @@
 	if against_voucher_type == 'Purchase Invoice':
 		bal = bal * -1
 
-	return bal
\ No newline at end of file
+	return bal
+
+def get_taxes_and_charges():
+	return [{
+	"account_head": "_Test Account Excise Duty - TCP1",
+	"charge_type": "On Net Total",
+	"cost_center": "Main - TCP1",
+	"description": "Excise Duty",
+	"doctype": "Sales Taxes and Charges",
+	"idx": 1,
+	"included_in_print_rate": 1,
+	"parentfield": "taxes",
+	"rate": 12
+	},
+	{
+	"account_head": "_Test Account Education Cess - TCP1",
+	"charge_type": "On Previous Row Amount",
+	"cost_center": "Main - TCP1",
+	"description": "Education Cess",
+	"doctype": "Sales Taxes and Charges",
+	"idx": 2,
+	"included_in_print_rate": 1,
+	"parentfield": "taxes",
+	"rate": 2,
+	"row_id": 1
+   }]
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.js b/erpnext/accounts/doctype/share_transfer/share_transfer.js
index 446ae68..364ca6f 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.js
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.js
@@ -16,7 +16,7 @@
 				};
 			};
 		});
-		if (frm.doc.docstatus == 1) {
+		if (frm.doc.docstatus == 1 && frm.doc.equity_or_liability_account && frm.doc.asset_account) {
 			frm.add_custom_button(__('Create Journal Entry'), function () {
 				erpnext.share_transfer.make_jv(frm);
 			});
diff --git a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
index 582ecb2..abc6ab8 100644
--- a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
@@ -14,13 +14,13 @@
 		shipping_rule.name = test_records[0].get('name')
 		shipping_rule.get("conditions")[0].from_value = 101
 		self.assertRaises(FromGreaterThanToError, shipping_rule.insert)
-		
+
 	def test_many_zero_to_values(self):
 		shipping_rule = frappe.copy_doc(test_records[0])
 		shipping_rule.name = test_records[0].get('name')
 		shipping_rule.get("conditions")[0].to_value = 0
 		self.assertRaises(ManyBlankToValuesError, shipping_rule.insert)
-		
+
 	def test_overlapping_conditions(self):
 		for range_a, range_b in [
 			((50, 150), (0, 100)),
@@ -38,6 +38,10 @@
 			self.assertRaises(OverlappingConditionError, shipping_rule.insert)
 
 def create_shipping_rule(shipping_rule_type, shipping_rule_name):
+
+	if frappe.db.exists("Shipping Rule", shipping_rule_name):
+		return frappe.get_doc("Shipping Rule", shipping_rule_name)
+
 	sr = frappe.new_doc("Shipping Rule")
 	sr.account =  "_Test Account Shipping Charges - _TC"
 	sr.calculate_based_on =  "Net Total"
@@ -70,4 +74,4 @@
 		})
 	sr.insert(ignore_permissions=True)
 	sr.submit()
-	return sr			
+	return sr
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 5c9e93d..43d9ad6 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -3,8 +3,9 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext
-from frappe.utils import flt, cstr, cint
+from frappe.utils import flt, cstr, cint, comma_and
 from frappe import _
+from erpnext.accounts.utils import get_stock_and_account_balance
 from frappe.model.meta import get_field_precision
 from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
@@ -12,6 +13,7 @@
 
 class ClosedAccountingPeriod(frappe.ValidationError): pass
 class StockAccountInvalidTransaction(frappe.ValidationError): pass
+class StockValueAndAccountBalanceOutOfSync(frappe.ValidationError): pass
 
 def make_gl_entries(gl_map, cancel=False, adv_adj=False, merge_entries=True, update_outstanding='Yes', from_repost=False):
 	if gl_map:
@@ -115,11 +117,9 @@
 
 def save_entries(gl_map, adv_adj, update_outstanding, from_repost=False):
 	if not from_repost:
-		validate_account_for_perpetual_inventory(gl_map)
 		validate_cwip_accounts(gl_map)
 
 	round_off_debit_credit(gl_map)
-
 	for entry in gl_map:
 		make_entry(entry, adv_adj, update_outstanding, from_repost)
 
@@ -127,6 +127,10 @@
 		if not from_repost:
 			validate_expense_against_budget(entry)
 
+	if not from_repost:
+		validate_account_for_perpetual_inventory(gl_map)
+
+
 def make_entry(args, adv_adj, update_outstanding, from_repost=False):
 	args.update({"doctype": "GL Entry"})
 	gle = frappe.get_doc(args)
@@ -137,15 +141,31 @@
 	gle.submit()
 
 def validate_account_for_perpetual_inventory(gl_map):
-	if cint(erpnext.is_perpetual_inventory_enabled(gl_map[0].company)) \
-		and gl_map[0].voucher_type=="Journal Entry":
-			aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
-				where account_type = 'Stock' and is_group=0""")]
+	if cint(erpnext.is_perpetual_inventory_enabled(gl_map[0].company)):
+		account_list = [gl_entries.account for gl_entries in gl_map]
 
-			for entry in gl_map:
-				if entry.account in aii_accounts:
+		aii_accounts = [d.name for d in frappe.get_all("Account",
+			filters={'account_type': 'Stock', 'is_group': 0, 'company': gl_map[0].company})]
+
+		for account in account_list:
+			if account not in aii_accounts:
+				continue
+
+			account_bal, stock_bal, warehouse_list = get_stock_and_account_balance(account,
+				gl_map[0].posting_date, gl_map[0].company)
+
+			if gl_map[0].voucher_type=="Journal Entry":
+				# In case of Journal Entry, there are no corresponding SL entries,
+				# hence deducting currency amount
+				account_bal -= flt(gl_map[0].debit) - flt(gl_map[0].credit)
+				if account_bal == stock_bal:
 					frappe.throw(_("Account: {0} can only be updated via Stock Transactions")
-						.format(entry.account), StockAccountInvalidTransaction)
+						.format(account), StockAccountInvalidTransaction)
+
+			elif account_bal != stock_bal:
+				frappe.throw(_("Account Balance ({0}) and Stock Value ({1}) is out of sync for account {2} and linked warehouse ({3}). Please create adjustment Journal Entry for amount {4}.")
+					.format(account_bal, stock_bal, account, comma_and(warehouse_list), stock_bal - account_bal),
+					StockValueAndAccountBalanceOutOfSync)
 
 def validate_cwip_accounts(gl_map):
 	if not cint(frappe.db.get_value("Asset Settings", None, "disable_cwip_accounting")) \
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 20f8737..59936d5 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -12,7 +12,7 @@
 from frappe.contacts.doctype.address.address import (get_address_display,
 	get_default_address, get_company_address)
 from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
-from erpnext.exceptions import PartyFrozen, InvalidAccountCurrency
+from erpnext.exceptions import PartyFrozen, PartyDisabled, InvalidAccountCurrency
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext import get_company_currency
 
@@ -446,7 +446,9 @@
 	if party_type and party_name:
 		if party_type in ("Customer", "Supplier"):
 			party = frappe.get_cached_value(party_type, party_name, ["is_frozen", "disabled"], as_dict=True)
-			if party.get("is_frozen"):
+			if party.disabled:
+				frappe.throw(_("{0} {1} is disabled").format(party_type, party_name), PartyDisabled)
+			elif party.get("is_frozen"):
 				frozen_accounts_modifier = frappe.db.get_single_value( 'Accounts Settings', 'frozen_accounts_modifier')
 				if not frozen_accounts_modifier in frappe.get_roles():
 					frappe.throw(_("{0} {1} is frozen").format(party_type, party_name), PartyFrozen)
diff --git a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html
index 2c01519..1d758e8 100644
--- a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html
+++ b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html
@@ -9,7 +9,7 @@
 	</div>
 	<div class="col-xs-{{ "3" if df.fieldtype=="Check" else "7" }} value">
 		{% if doc.get(df.fieldname) != None -%}
-			{{ frappe.utils.fmt_money((doc[df.fieldname])|int|abs, currency=doc.currency) }}
+			{{ frappe.utils.fmt_money((doc[df.fieldname])|abs, currency=doc.currency) }}
 		{% endif %}
 	</div>
 </div>
@@ -26,7 +26,7 @@
 					<div class="col-xs-5 {%- if doc.align_labels_right %} text-right{%- endif -%}">
 						<label>{{ charge.get_formatted("description") }}</label></div>
 					<div class="col-xs-7 text-right">
-						{{ frappe.utils.fmt_money((charge.tax_amount)|int|abs, currency=doc.currency) }}
+						{{ frappe.utils.fmt_money((charge.tax_amount)|abs, currency=doc.currency) }}
 					</div>
 				</div>
 				{%- endif -%}
@@ -65,8 +65,10 @@
 						{% for tdf in visible_columns %}
 						{% if not d.flags.compact_item_print or tdf.fieldname in doc.get(df.fieldname)[0].flags.compact_item_fields %}
 							<td class="{{ get_align_class(tdf) }}" {{ fieldmeta(df) }}>
-								{% if tdf.fieldtype == 'Currency' %}
-									<div class="value">{{ frappe.utils.fmt_money((d[tdf.fieldname])|int|abs, currency=doc.currency) }}</div></td>
+								{% if tdf.fieldname == 'qty' %}
+									<div class="value">{{ (d[tdf.fieldname])|abs }}</div></td>
+								{% elif tdf.fieldtype == 'Currency' %}
+									<div class="value">{{ frappe.utils.fmt_money((d[tdf.fieldname])|abs, currency=doc.currency) }}</div></td>
 								{% else %}
 									<div class="value">{{ print_value(tdf, d, doc, visible_columns) }}</div></td>
 								{% endif %}
@@ -117,7 +119,7 @@
 						{{ render_currency(df, doc) }}
 					{% elif df.fieldtype =='Table' %}
 						{{ render_table(df, doc)}}
-					{% elif doc[df.fieldname] %}
+					{% elif doc[df.fieldname] and df.fieldname != 'total_qty' %}
 						{{ render_field(df, doc) }}
 					{% endif %}
            		 {% endfor %}
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index 146c10c..8d65ac8 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -69,7 +69,7 @@
 	for year in fiscal_year:
 		for from_date, to_date in get_period_date_ranges(filters["period"], year[0]):
 			if filters["period"] == "Yearly":
-				labels = [_("Budget") + " " + str(year[0]), _("Actual ") + " " + str(year[0]), _("Varaiance ") + " " + str(year[0])]
+				labels = [_("Budget") + " " + str(year[0]), _("Actual ") + " " + str(year[0]), _("Variance ") + " " + str(year[0])]
 				for label in labels:
 					columns.append(label+":Float:150")
 			else:
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index ac69fd3..382a89b 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -13,6 +13,10 @@
 # imported to enable erpnext.accounts.utils.get_account_currency
 from erpnext.accounts.doctype.account.account import get_account_currency
 
+from erpnext.stock.utils import get_stock_value_on
+from erpnext.stock import get_warehouse_account_map
+
+
 class FiscalYearError(frappe.ValidationError): pass
 
 @frappe.whitelist()
@@ -560,23 +564,23 @@
 				(dr_or_cr, dr_or_cr, '%s', '%s', '%s', dr_or_cr),
 				(d.diff, d.voucher_type, d.voucher_no))
 
-def get_stock_and_account_difference(account_list=None, posting_date=None, company=None):
-	from erpnext.stock.utils import get_stock_value_on
-	from erpnext.stock import get_warehouse_account_map
-
+def get_stock_and_account_balance(account=None, posting_date=None, company=None):
 	if not posting_date: posting_date = nowdate()
 
-	difference = {}
 	warehouse_account = get_warehouse_account_map(company)
 
-	for warehouse, account_data in iteritems(warehouse_account):
-		if account_data.get('account') in account_list:
-			account_balance = get_balance_on(account_data.get('account'), posting_date, in_account_currency=False)
-			stock_value = get_stock_value_on(warehouse, posting_date)
-			if abs(flt(stock_value) - flt(account_balance)) > 0.005:
-				difference.setdefault(account_data.get('account'), flt(stock_value) - flt(account_balance))
+	account_balance = get_balance_on(account, posting_date, in_account_currency=False)
 
-	return difference
+	related_warehouses = [wh for wh, wh_details in warehouse_account.items()
+		if wh_details.account == account and not wh_details.is_group]
+
+	total_stock_value = 0.0
+	for warehouse in related_warehouses:
+		value = get_stock_value_on(warehouse, posting_date)
+		total_stock_value += value
+
+	precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
+	return flt(account_balance, precision), flt(total_stock_value, precision), related_warehouses
 
 def get_currency_precision():
 	precision = cint(frappe.db.get_default("currency_precision"))
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 306fb14..6e2bbc1 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -20,12 +20,7 @@
 		self.validate_asset_values()
 		self.validate_item()
 		self.set_missing_values()
-		if self.calculate_depreciation:
-			self.set_depreciation_rate()
-			self.make_depreciation_schedule()
-			self.set_accumulated_depreciation()
-		else:
-			self.finance_books = []
+		self.prepare_depreciation_data()
 		if self.get("schedules"):
 			self.validate_expected_value_after_useful_life()
 
@@ -45,6 +40,17 @@
 		delete_gl_entries(voucher_type='Asset', voucher_no=self.name)
 		self.db_set('booked_fixed_asset', 0)
 
+	def prepare_depreciation_data(self):
+		if self.calculate_depreciation:
+			self.value_after_depreciation = 0
+			self.set_depreciation_rate()
+			self.make_depreciation_schedule()
+			self.set_accumulated_depreciation()
+		else:
+			self.finance_books = []
+			self.value_after_depreciation = (flt(self.gross_purchase_amount) -
+				flt(self.opening_accumulated_depreciation))
+
 	def validate_item(self):
 		item = frappe.get_cached_value("Item", self.item_code,
 			["is_fixed_asset", "is_stock_item", "disabled"], as_dict=1)
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index e911e80..2d23f77 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -188,7 +188,8 @@
 				idx = d.idx
 				break
 
-	value_after_depreciation = asset.finance_books[idx - 1].value_after_depreciation
+	value_after_depreciation = (asset.finance_books[idx - 1].value_after_depreciation
+		if asset.calculate_depreciation else asset.value_after_depreciation)
 	accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
 
 	gl_entries = [
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
index ae2aa54..b40243c 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
@@ -1,13 +1,13 @@
 {
  "add_total_row": 0,
  "creation": "2019-09-23 16:35:02.836134",
- "disable_prepared_report": 0,
+ "disable_prepared_report": 1,
  "disabled": 0,
  "docstatus": 0,
  "doctype": "Report",
  "idx": 0,
  "is_standard": "Yes",
- "modified": "2019-09-23 16:35:02.836134",
+ "modified": "2019-10-22 13:00:31.539726",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Fixed Asset Register",
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
index 2c9e48a..f395499 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import cstr
 
 def execute(filters=None):
 	filters = frappe._dict(filters or {})
@@ -149,12 +150,12 @@
 		FROM `tabAsset Finance Book`
 		WHERE
 			parentfield='finance_books'
-			AND finance_book=%s''', (finance_book)))
+			AND ifnull(finance_book, '')=%s''', cstr(finance_book)))
 
 def get_purchase_receipt_supplier_map():
 	return frappe._dict(frappe.db.sql(''' Select
 		pr.name, pr.supplier
-		FROM `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pri 
+		FROM `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pri
 		WHERE
 			pri.parent = pr.name
 			AND pri.is_fixed_asset=1
@@ -164,7 +165,7 @@
 def get_purchase_invoice_supplier_map():
 	return frappe._dict(frappe.db.sql(''' Select
 		pi.name, pi.supplier
-		FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pii 
+		FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pii
 		WHERE
 			pii.parent = pi.name
 			AND pii.is_fixed_asset=1
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index ff0b65b..4506db6 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -589,6 +589,23 @@
 		frappe.db.set_value("Accounts Settings", "Accounts Settings",
 			"unlink_advance_payment_on_cancelation_of_order", 0)
 
+	def test_schedule_date(self):
+		po = create_purchase_order(do_not_submit=True)
+		po.schedule_date = None
+		po.append("items", {
+			"item_code": "_Test Item",
+			"qty": 1,
+			"rate": 100,
+			"schedule_date": add_days(nowdate(), 5)
+		})
+		po.save()
+		self.assertEqual(po.schedule_date, add_days(nowdate(), 1))
+
+		po.items[0].schedule_date = add_days(nowdate(), 2)
+		po.save()
+		self.assertEqual(po.schedule_date, add_days(nowdate(), 2))
+
+
 def make_pr_against_po(po, received_qty=0):
 	pr = make_purchase_receipt(po)
 	pr.get("items")[0].qty = received_qty or 5
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index 227a3df..a377ec9 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -5,6 +5,7 @@
 
 import frappe, unittest
 from erpnext.accounts.party import get_due_date
+from erpnext.exceptions import PartyDisabled
 from frappe.test_runner import make_test_records
 
 test_dependencies = ['Payment Term', 'Payment Terms Template']
@@ -70,7 +71,7 @@
 
         po = create_purchase_order(do_not_save=True)
 
-        self.assertRaises(frappe.ValidationError, po.save)
+        self.assertRaises(PartyDisabled, po.save)
 
         frappe.db.set_value("Supplier", "_Test Supplier", "disabled", 0)
 
diff --git a/erpnext/config/accounting.py b/erpnext/config/accounts.py
similarity index 100%
rename from erpnext/config/accounting.py
rename to erpnext/config/accounts.py
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 8ce0964..95f6f7c 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -18,7 +18,7 @@
 			"onboard_present": 1
 		},
 		{
-			"module_name": "Accounting",
+			"module_name": "Accounts",
 			"category": "Modules",
 			"label": _("Accounting"),
 			"color": "#3498db",
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 928bd5f..5db4cc2 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -127,7 +127,11 @@
 					"name": "Shipping Rule",
 					"description": _("Rules for adding shipping costs."),
 				},
-
+				{
+					"type": "doctype",
+					"name": "Coupon Code",
+					"description": _("Define coupon codes."),
+				}
 			]
 		},
 		{
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 1d4a25e..67f453d 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1172,6 +1172,7 @@
 def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, child_docname="items"):
 	data = json.loads(trans_items)
 
+	sales_doctypes = ['Sales Order', 'Sales Invoice', 'Delivery Note', 'Quotation']
 	parent = frappe.get_doc(parent_doctype, parent_doctype_name)
 
 	for d in data:
@@ -1204,18 +1205,22 @@
 				#  if rate is greater than price_list_rate, set margin
 				#  or set discount
 				child_item.discount_percentage = 0
-				child_item.margin_type = "Amount"
-				child_item.margin_rate_or_amount = flt(child_item.rate - child_item.price_list_rate,
-					child_item.precision("margin_rate_or_amount"))
-				child_item.rate_with_margin = child_item.rate
+
+				if parent_doctype in sales_doctypes:
+					child_item.margin_type = "Amount"
+					child_item.margin_rate_or_amount = flt(child_item.rate - child_item.price_list_rate,
+						child_item.precision("margin_rate_or_amount"))
+					child_item.rate_with_margin = child_item.rate
 			else:
 				child_item.discount_percentage = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0,
 					child_item.precision("discount_percentage"))
 				child_item.discount_amount = flt(
 					child_item.price_list_rate) - flt(child_item.rate)
-				child_item.margin_type = ""
-				child_item.margin_rate_or_amount = 0
-				child_item.rate_with_margin = 0
+
+				if parent_doctype in sales_doctypes:
+					child_item.margin_type = ""
+					child_item.margin_rate_or_amount = 0
+					child_item.rate_with_margin = 0
 
 		child_item.flags.ignore_validate_update_after_submit = True
 		if new_child_flag:
@@ -1228,6 +1233,8 @@
 	parent.flags.ignore_validate_update_after_submit = True
 	parent.set_qty_as_per_stock_uom()
 	parent.calculate_taxes_and_totals()
+	if parent_doctype == "Sales Order":
+		parent.set_gross_profit()
 	frappe.get_doc('Authorization Control').validate_approving_authority(parent.doctype,
 		parent.company, parent.base_grand_total)
 
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 9d37df0..0dde898 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -695,8 +695,10 @@
 	def validate_schedule_date(self):
 		if not self.get("items"):
 			return
-		if not self.schedule_date:
-			self.schedule_date = min([d.schedule_date for d in self.get("items")])
+
+		earliest_schedule_date = min([d.schedule_date for d in self.get("items")])
+		if earliest_schedule_date:
+			self.schedule_date = earliest_schedule_date
 
 		if self.schedule_date:
 			for d in self.get('items'):
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 19dea08..2f6b59f 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -280,22 +280,31 @@
 		"page_len": page_len
 	}
 
+	having_clause = "having sum(sle.actual_qty) > 0"
+	if filters.get("is_return"):
+		having_clause = ""
+
 	if args.get('warehouse'):
-		batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom, concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date)
-				from `tabStock Ledger Entry` sle
-				    INNER JOIN `tabBatch` batch on sle.batch_no = batch.name
-				where
-					batch.disabled = 0
-					and sle.item_code = %(item_code)s
-					and sle.warehouse = %(warehouse)s
-					and (sle.batch_no like %(txt)s
-					or batch.manufacturing_date like %(txt)s)
-					and batch.docstatus < 2
-					{0}
-					{match_conditions}
-				group by batch_no having sum(sle.actual_qty) > 0
-				order by batch.expiry_date, sle.batch_no desc
-				limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args)
+		batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom,
+				concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date)
+			from `tabStock Ledger Entry` sle
+				INNER JOIN `tabBatch` batch on sle.batch_no = batch.name
+			where
+				batch.disabled = 0
+				and sle.item_code = %(item_code)s
+				and sle.warehouse = %(warehouse)s
+				and (sle.batch_no like %(txt)s
+				or batch.manufacturing_date like %(txt)s)
+				and batch.docstatus < 2
+				{cond}
+				{match_conditions}
+			group by batch_no {having_clause}
+			order by batch.expiry_date, sle.batch_no desc
+			limit %(start)s, %(page_len)s""".format(
+				cond=cond,
+				match_conditions=get_match_cond(doctype),
+				having_clause = having_clause
+			), args)
 
 		return batch_nos
 	else:
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 2d87a98..542073e 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -207,41 +207,6 @@
 						reference_doctype=self.doctype,
 						reference_name=self.name)).insert().name
 
-	def make_adjustment_entry(self, expected_gle, voucher_obj):
-		from erpnext.accounts.utils import get_stock_and_account_difference
-		account_list = [d.account for d in expected_gle]
-		acc_diff = get_stock_and_account_difference(account_list,
-			expected_gle[0].posting_date, self.company)
-
-		cost_center = self.get_company_default("cost_center")
-		stock_adjustment_account = self.get_company_default("stock_adjustment_account")
-
-		gl_entries = []
-		for account, diff in acc_diff.items():
-			if diff:
-				gl_entries.append([
-					# stock in hand account
-					voucher_obj.get_gl_dict({
-						"account": account,
-						"against": stock_adjustment_account,
-						"debit": diff,
-						"remarks": "Adjustment Accounting Entry for Stock",
-					}),
-
-					# account against stock in hand
-					voucher_obj.get_gl_dict({
-						"account": stock_adjustment_account,
-						"against": account,
-						"credit": diff,
-						"cost_center": cost_center or None,
-						"remarks": "Adjustment Accounting Entry for Stock",
-					}),
-				])
-
-		if gl_entries:
-			from erpnext.accounts.general_ledger import make_gl_entries
-			make_gl_entries(gl_entries)
-
 	def check_expense_account(self, item):
 		if not item.get("expense_account"):
 			frappe.throw(_("Expense or Difference account is mandatory for Item {0} as it impacts overall stock value").format(item.item_code))
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index c9216ee..1dae4b9 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -146,14 +146,7 @@
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
 	def set_missing_values(source, target):
-		address = frappe.get_all('Dynamic Link', {
-			'link_doctype': source.doctype,
-			'link_name': source.name,
-			'parenttype': 'Address',
-		}, ['parent'], limit=1)
-
-		if address:
-			target.customer_address = address[0].parent
+		_set_missing_values(source, target)
 
 	target_doc = get_mapped_doc("Lead", source_name,
 		{"Lead": {
@@ -173,13 +166,17 @@
 
 @frappe.whitelist()
 def make_quotation(source_name, target_doc=None):
+	def set_missing_values(source, target):
+		_set_missing_values(source, target)
+
 	target_doc = get_mapped_doc("Lead", source_name,
 		{"Lead": {
 			"doctype": "Quotation",
 			"field_map": {
 				"name": "party_name"
 			}
-		}}, target_doc)
+		}}, target_doc, set_missing_values)
+
 	target_doc.quotation_to = "Lead"
 	target_doc.run_method("set_missing_values")
 	target_doc.run_method("set_other_charges")
@@ -187,6 +184,25 @@
 
 	return target_doc
 
+def _set_missing_values(source, target):
+	address = frappe.get_all('Dynamic Link', {
+			'link_doctype': source.doctype,
+			'link_name': source.name,
+			'parenttype': 'Address',
+		}, ['parent'], limit=1)
+
+	contact = frappe.get_all('Dynamic Link', {
+			'link_doctype': source.doctype,
+			'link_name': source.name,
+			'parenttype': 'Contact',
+		}, ['parent'], limit=1)
+
+	if address:
+		target.customer_address = address[0].parent
+
+	if contact:
+		target.contact_person = contact[0].parent
+
 @frappe.whitelist()
 def get_lead_details(lead, posting_date=None, company=None):
 	if not lead: return {}
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 6e4d3ed..c9b0433 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -100,10 +100,6 @@
 				});
 			}
 		}
-
-		if (frm.doc.opportunity_from && frm.doc.party_name && !frm.doc.contact_person) {
-			frm.trigger("party_name");
-		}
 	},
 
 	set_contact_link: function(frm) {
@@ -171,7 +167,7 @@
 		if (me.frm.doc.opportunity_from == "Lead") {
 			me.frm.set_query('party_name', erpnext.queries['lead']);
 		}
-		else if (me.frm.doc.opportunity_from == "Cuatomer") {
+		else if (me.frm.doc.opportunity_from == "Customer") {
 			me.frm.set_query('party_name', erpnext.queries['customer']);
 		}
 	},
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 48dcdbe..a395c7c 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -10,13 +10,14 @@
 from frappe import _
 
 def setup(domain):
+	frappe.flags.in_demo = 1
 	complete_setup(domain)
 	setup_demo_page()
 	setup_fiscal_year()
 	setup_holiday_list()
 	setup_user()
 	setup_employee()
-	setup_user_roles()
+	setup_user_roles(domain)
 	setup_role_permissions()
 	setup_custom_field_for_domain()
 
@@ -183,13 +184,19 @@
 
 	return ss
 
-def setup_user_roles():
+def setup_user_roles(domain):
 	user = frappe.get_doc('User', 'demo@erpnext.com')
 	user.add_roles('HR User', 'HR Manager', 'Accounts User', 'Accounts Manager',
 		'Stock User', 'Stock Manager', 'Sales User', 'Sales Manager', 'Purchase User',
 		'Purchase Manager', 'Projects User', 'Manufacturing User', 'Manufacturing Manager',
-		'Support Team', 'Academics User', 'Physician', 'Healthcare Administrator', 'Laboratory User',
-		'Nursing User', 'Patient')
+		'Support Team')
+
+	if domain == "Healthcare":
+		user.add_roles('Physician', 'Healthcare Administrator', 'Laboratory User',
+			'Nursing User', 'Patient')
+
+	if domain == "Education":
+		user.add_roles('Academics User')
 
 	if not frappe.db.get_global('demo_hr_user'):
 		user = frappe.get_doc('User', 'CaitlinSnow@example.com')
@@ -219,7 +226,7 @@
 
 	if not frappe.db.get_global('demo_manufacturing_user'):
 		user = frappe.get_doc('User', 'NeptuniaAquaria@example.com')
-		user.add_roles('Manufacturing User', 'Stock User', 'Purchase User', 'Accounts User')
+		user.add_roles('Manufacturing User', 'Stock Manager', 'Stock User', 'Purchase User', 'Accounts User')
 		update_employee_department(user.name, 'Production')
 		frappe.db.set_global('demo_manufacturing_user', user.name)
 
@@ -241,11 +248,12 @@
 		update_employee_department(user.name, 'Management')
 		frappe.db.set_global('demo_projects_user', user.name)
 
-	if not frappe.db.get_global('demo_education_user'):
-		user = frappe.get_doc('User', 'ArthurCurry@example.com')
-		user.add_roles('Academics User')
-		update_employee_department(user.name, 'Management')
-		frappe.db.set_global('demo_education_user', user.name)
+	if domain == "Education":
+		if not frappe.db.get_global('demo_education_user'):
+			user = frappe.get_doc('User', 'ArthurCurry@example.com')
+			user.add_roles('Academics User')
+			update_employee_department(user.name, 'Management')
+			frappe.db.set_global('demo_education_user', user.name)
 
 	#Add Expense Approver
 	user = frappe.get_doc('User', 'ClarkKent@example.com')
diff --git a/erpnext/demo/user/accounts.py b/erpnext/demo/user/accounts.py
index 6206dfd..7fab772 100644
--- a/erpnext/demo/user/accounts.py
+++ b/erpnext/demo/user/accounts.py
@@ -73,14 +73,16 @@
 	make_pos_invoice()
 
 def make_payment_entries(ref_doctype, report):
-	outstanding_invoices = list(set([r[3] for r in query_report.run(report, {
-						"report_date": frappe.flags.current_date,
-						"company": erpnext.get_default_company()
-					})["result"] if r[2]==ref_doctype]))
+
+	outstanding_invoices = frappe.get_all(ref_doctype, fields=["name"],
+		filters={
+			"company": erpnext.get_default_company(),
+			"outstanding_amount": (">", 0.0)
+		})
 
 	# make Payment Entry
 	for inv in outstanding_invoices[:random.randint(1, 2)]:
-		pe = get_payment_entry(ref_doctype, inv)
+		pe = get_payment_entry(ref_doctype, inv.name)
 		pe.posting_date = frappe.flags.current_date
 		pe.reference_no = random_string(6)
 		pe.reference_date = frappe.flags.current_date
@@ -91,7 +93,7 @@
 
 	# make payment via JV
 	for inv in outstanding_invoices[:1]:
-		jv = frappe.get_doc(get_payment_entry_against_invoice(ref_doctype, inv))
+		jv = frappe.get_doc(get_payment_entry_against_invoice(ref_doctype, inv.name))
 		jv.posting_date = frappe.flags.current_date
 		jv.cheque_no = random_string(6)
 		jv.cheque_date = frappe.flags.current_date
diff --git a/erpnext/demo/user/projects.py b/erpnext/demo/user/projects.py
index 36d676f..044e296 100644
--- a/erpnext/demo/user/projects.py
+++ b/erpnext/demo/user/projects.py
@@ -39,61 +39,4 @@
 			"doctype": "Project",
 			"project_name": "New Product Development " + current_date.strftime("%Y-%m-%d"),
 		})
-		project.set("tasks", [
-				{
-					"title": "Review Requirements",
-					"start_date": frappe.utils.add_days(current_date, 10),
-					"end_date": frappe.utils.add_days(current_date, 11)
-				},
-				{
-					"title": "Design Options",
-					"start_date": frappe.utils.add_days(current_date, 11),
-					"end_date": frappe.utils.add_days(current_date, 20)
-				},
-				{
-					"title": "Make Prototypes",
-					"start_date": frappe.utils.add_days(current_date, 20),
-					"end_date": frappe.utils.add_days(current_date, 30)
-				},
-				{
-					"title": "Customer Feedback on Prototypes",
-					"start_date": frappe.utils.add_days(current_date, 30),
-					"end_date": frappe.utils.add_days(current_date, 40)
-				},
-				{
-					"title": "Freeze Feature Set",
-					"start_date": frappe.utils.add_days(current_date, 40),
-					"end_date": frappe.utils.add_days(current_date, 45)
-				},
-				{
-					"title": "Testing",
-					"start_date": frappe.utils.add_days(current_date, 45),
-					"end_date": frappe.utils.add_days(current_date, 60)
-				},
-				{
-					"title": "Product Engineering",
-					"start_date": frappe.utils.add_days(current_date, 45),
-					"end_date": frappe.utils.add_days(current_date, 55)
-				},
-				{
-					"title": "Supplier Contracts",
-					"start_date": frappe.utils.add_days(current_date, 55),
-					"end_date": frappe.utils.add_days(current_date, 70)
-				},
-				{
-					"title": "Design and Build Fixtures",
-					"start_date": frappe.utils.add_days(current_date, 45),
-					"end_date": frappe.utils.add_days(current_date, 65)
-				},
-				{
-					"title": "Test Run",
-					"start_date": frappe.utils.add_days(current_date, 70),
-					"end_date": frappe.utils.add_days(current_date, 80)
-				},
-				{
-					"title": "Launch",
-					"start_date": frappe.utils.add_days(current_date, 80),
-					"end_date": frappe.utils.add_days(current_date, 90)
-				},
-			])
 		project.insert()
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index 457e976..8d5ba28 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -66,7 +66,7 @@
 	b = frappe.get_doc({
 		"doctype": "Opportunity",
 		"opportunity_from": "Customer",
-		"customer": get_random("Customer"),
+		"party_name": frappe.get_value("Customer", get_random("Customer"), 'name'),
 		"opportunity_type": "Sales",
 		"with_items": 1,
 		"transaction_date": frappe.flags.current_date,
diff --git a/erpnext/erpnext_integrations/connectors/shopify_connection.py b/erpnext/erpnext_integrations/connectors/shopify_connection.py
index bd98037..3be08a2 100644
--- a/erpnext/erpnext_integrations/connectors/shopify_connection.py
+++ b/erpnext/erpnext_integrations/connectors/shopify_connection.py
@@ -29,7 +29,8 @@
 			validate_item(order, shopify_settings)
 			create_order(order, shopify_settings)
 		except Exception as e:
-			make_shopify_log(status="Error", message=e.message, exception=False)
+			make_shopify_log(status="Error", exception=e)
+
 		else:
 			make_shopify_log(status="Success")
 
@@ -42,9 +43,9 @@
 		sales_order = get_sales_order(cstr(order['id']))
 		if sales_order:
 			create_sales_invoice(order, shopify_settings, sales_order)
-		make_shopify_log(status="Success")
-	except Exception:
-		make_shopify_log(status="Error", exception=True)
+			make_shopify_log(status="Success")
+	except Exception as e:
+		make_shopify_log(status="Error", exception=e, rollback=True)
 
 def prepare_delivery_note(order, request_id=None):
 	frappe.set_user('Administrator')
@@ -56,8 +57,8 @@
 		if sales_order:
 			create_delivery_note(order, shopify_settings, sales_order)
 		make_shopify_log(status="Success")
-	except Exception:
-		make_shopify_log(status="Error", exception=True)
+	except Exception as e:
+		make_shopify_log(status="Error", exception=e, rollback=True)
 
 def get_sales_order(shopify_order_id):
 	sales_order = frappe.db.get_value("Sales Order", filters={"shopify_order_id": shopify_order_id})
@@ -97,7 +98,7 @@
 			message = 'Following items are exists in order but relevant record not found in Product master'
 			message += "\n" + ", ".join(product_not_exists)
 
-			make_shopify_log(status="Error", message=message, exception=True)
+			make_shopify_log(status="Error", exception=e, rollback=True)
 
 			return ''
 
diff --git a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py
index 0c821e0..a2b6af9 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.py
@@ -12,23 +12,38 @@
 	pass
 
 
-def make_shopify_log(status="Queued", message=None, exception=False):
+def make_shopify_log(status="Queued", exception=None, rollback=False):
 	# if name not provided by log calling method then fetch existing queued state log
+	make_new = False
+
 	if not frappe.flags.request_id:
-		return
+		make_new = True
 
-	log = frappe.get_doc("Shopify Log", frappe.flags.request_id)
-
-	if exception:
+	if rollback:
 		frappe.db.rollback()
-		log = frappe.get_doc({"doctype":"Shopify Log"}).insert(ignore_permissions=True)
 
-	log.message = message if message else ''
+	if make_new:
+		log = frappe.get_doc({"doctype":"Shopify Log"}).insert(ignore_permissions=True)
+	else:
+		log = log = frappe.get_doc("Shopify Log", frappe.flags.request_id)
+
+	log.message = get_message(exception)
 	log.traceback = frappe.get_traceback()
 	log.status = status
 	log.save(ignore_permissions=True)
 	frappe.db.commit()
 
+def get_message(exception):
+	message = None
+
+	if hasattr(exception, 'message'):
+		message = exception.message
+	elif hasattr(exception, '__str__'):
+		message = exception.__str__()
+	else:
+		message = "Something went wrong while syncing"
+	return message
+
 def dump_request_data(data, event="create/order"):
 	event_mapper = {
 		"orders/create": get_webhook_address(connector_name='shopify_connection', method="sync_sales_order", exclude_uri=True),
@@ -43,11 +58,11 @@
 	}).insert(ignore_permissions=True)
 
 	frappe.db.commit()
-	frappe.enqueue(method=event_mapper[event], queue='short', timeout=300, is_async=True, 
+	frappe.enqueue(method=event_mapper[event], queue='short', timeout=300, is_async=True,
 		**{"order": data, "request_id": log.name})
 
 @frappe.whitelist()
 def resync(method, name, request_data):
 	frappe.db.set_value("Shopify Log", name, "status", "Queued", update_modified=False)
-	frappe.enqueue(method=method, queue='short', timeout=300, is_async=True, 
+	frappe.enqueue(method=method, queue='short', timeout=300, is_async=True,
 		**{"order": json.loads(request_data), "request_id": name})
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
index e2f6d49..0cad0cc 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
@@ -30,13 +30,9 @@
 		# url = get_shopify_url('admin/webhooks.json', self)
 		created_webhooks = [d.method for d in self.webhooks]
 		url = get_shopify_url('admin/api/2019-04/webhooks.json', self)
-		print('url', url)
 		for method in webhooks:
-			print('method', method)
 			session = get_request_session()
-			print('session', session)
 			try:
-				print(get_header(self))
 				d = session.post(url, data=json.dumps({
 					"webhook": {
 						"topic": method,
@@ -44,11 +40,10 @@
 						"format": "json"
 						}
 					}), headers=get_header(self))
-				print('d', d.json())
 				d.raise_for_status()
 				self.update_webhook_table(method, d.json())
 			except Exception as e:
-				make_shopify_log(status="Warning", message=e, exception=False)
+				make_shopify_log(status="Warning", exception=e, rollback=True)
 
 	def unregister_webhooks(self):
 		session = get_request_session()
@@ -67,7 +62,6 @@
 			self.remove(d)
 
 	def update_webhook_table(self, method, res):
-		print('update')
 		self.append("webhooks", {
 			"webhook_id": res['webhook']['id'],
 			"method": method
@@ -75,7 +69,6 @@
 
 def get_shopify_url(path, settings):
 	if settings.app_type == "Private":
-		print(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
 		return 'https://{}:{}@{}/{}'.format(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
 	else:
 		return 'https://{}/{}'.format(settings.shopify_url, path)
diff --git a/erpnext/exceptions.py b/erpnext/exceptions.py
index fb3a5cb..d92af5d 100644
--- a/erpnext/exceptions.py
+++ b/erpnext/exceptions.py
@@ -5,3 +5,4 @@
 class PartyFrozen(frappe.ValidationError): pass
 class InvalidAccountCurrency(frappe.ValidationError): pass
 class InvalidCurrency(frappe.ValidationError): pass
+class PartyDisabled(frappe.ValidationError):pass
diff --git a/erpnext/healthcare/page/patient_history/patient_history.js b/erpnext/healthcare/page/patient_history/patient_history.js
index 87fe7ed..fe5b7bc 100644
--- a/erpnext/healthcare/page/patient_history/patient_history.js
+++ b/erpnext/healthcare/page/patient_history/patient_history.js
@@ -234,7 +234,7 @@
 				<a class='btn btn-default btn-xs btn-show-chart' data-show-chart-id='temperature' \
 				data-pts='°C or °F' data-title='Temperature'>Temperature</a>\
 				<a class='btn btn-default btn-xs btn-show-chart' data-show-chart-id='bmi' \
-				data-pts='bmi' data-title='BMI'>BMI</a></div>";
+				data-pts='' data-title='BMI'>BMI</a></div>";
 				me.page.main.find(".show_chart_btns").html(show_chart_btns_html);
 				var data = r.message;
 				let labels = [], datasets = [];
@@ -275,7 +275,7 @@
 					datasets.push({name: "Heart Rate / Pulse", values: pulse, chartType:'line'});
 					datasets.push({name: "Respiratory Rate", values: respiratory_rate, chartType:'line'});
 				}
-				new Chart( ".patient_vital_charts", {
+				new frappe.Chart( ".patient_vital_charts", {
 					data: {
 						labels: labels,
 						datasets: datasets
@@ -283,7 +283,7 @@
 
 					title: title,
 					type: 'axis-mixed', // 'axis-mixed', 'bar', 'line', 'pie', 'percentage'
-					height: 150,
+					height: 200,
 					colors: ['purple', '#ffa3ef', 'light-blue'],
 
 					tooltipOptions: {
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 5c61874..b1855ec 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -283,7 +283,6 @@
 	],
 	"daily": [
 		"erpnext.stock.reorder_item.reorder_item",
-		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.support.doctype.issue.issue.auto_close_tickets",
 		"erpnext.crm.doctype.opportunity.opportunity.auto_close_opportunity",
 		"erpnext.controllers.accounts_controller.update_invoice_status",
@@ -306,6 +305,7 @@
 		"erpnext.crm.doctype.email_campaign.email_campaign.set_email_campaign_status"
 	],
 	"daily_long": [
+		"erpnext.setup.doctype.email_digest.email_digest.send",
 		"erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool.update_latest_price_in_all_boms",
 		"erpnext.hr.doctype.leave_ledger_entry.leave_ledger_entry.process_expired_allocation",
 		"erpnext.hr.utils.generate_leave_encashment"
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim_list.js b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
index 0e25e66..6195ad4 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim_list.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
@@ -2,11 +2,11 @@
 	add_fields: ["total_claimed_amount", "docstatus"],
 	get_indicator: function(doc) {
 		if(doc.status == "Paid") {
-			return [__("Paid"), "green", "status,=,'Paid'"];
+			return [__("Paid"), "green", "status,=,Paid"];
 		}else if(doc.status == "Unpaid") {
-			return [__("Unpaid"), "orange"];
+			return [__("Unpaid"), "orange", "status,=,Unpaid"];
 		} else if(doc.status == "Rejected") {
-			return [__("Rejected"), "grey"];
+			return [__("Rejected"), "grey", "status,=,Rejected"];
 		}
 	}
 };
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 5e71c00..e1e5e80 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -404,8 +404,11 @@
 	if cint(half_day) == 1:
 		if from_date == to_date:
 			number_of_days = 0.5
-		else:
+		elif half_day_date and half_day_date <= to_date:
 			number_of_days = date_diff(to_date, from_date) + .5
+		else:
+			number_of_days = date_diff(to_date, from_date) + 1
+
 	else:
 		number_of_days = date_diff(to_date, from_date) + 1
 
@@ -500,14 +503,17 @@
 
 def get_pending_leaves_for_period(employee, leave_type, from_date, to_date):
 	''' Returns leaves that are pending approval '''
-	return frappe.db.get_value("Leave Application",
+	leaves = frappe.get_all("Leave Application",
 		filters={
 			"employee": employee,
 			"leave_type": leave_type,
-			"from_date": ("<=", from_date),
-			"to_date": (">=", to_date),
 			"status": "Open"
-		}, fieldname=['SUM(total_leave_days)']) or flt(0)
+		},
+		or_filters={
+			"from_date": ["between", (from_date, to_date)],
+			"to_date": ["between", (from_date, to_date)]
+		}, fields=['SUM(total_leave_days) as leaves'])[0]
+	return leaves['leaves'] if leaves['leaves'] else 0.0
 
 def get_remaining_leaves(allocation, leaves_taken, date, expiry):
 	''' Returns minimum leaves remaining after comparing with remaining days for allocation expiry '''
@@ -549,8 +555,16 @@
 			if leave_entry.to_date > getdate(to_date):
 				leave_entry.to_date = to_date
 
+			half_day = 0
+			half_day_date = None
+			# fetch half day date for leaves with half days
+			if leave_entry.leaves % 1:
+				half_day = 1
+				half_day_date = frappe.db.get_value('Leave Application',
+					{'name': leave_entry.transaction_name}, ['half_day_date'])
+
 			leave_days += get_number_of_leave_days(employee, leave_type,
-				leave_entry.from_date, leave_entry.to_date) * -1
+				leave_entry.from_date, leave_entry.to_date, half_day, half_day_date) * -1
 
 	return leave_days
 
@@ -562,7 +576,7 @@
 def get_leave_entries(employee, leave_type, from_date, to_date):
 	''' Returns leave entries between from_date and to_date '''
 	return frappe.db.sql("""
-		select employee, leave_type, from_date, to_date, leaves, transaction_type, is_carry_forward
+		select employee, leave_type, from_date, to_date, leaves, transaction_type, is_carry_forward, transaction_name
 		from `tabLeave Ledger Entry`
 		where employee=%(employee)s and leave_type=%(leave_type)s
 			and docstatus=1
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 27a51c3..46be4fe 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -5,7 +5,7 @@
 import frappe, erpnext
 import datetime, math
 
-from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words, getdate
+from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words
 from frappe.model.naming import make_autoname
 
 from frappe import msgprint, _
diff --git a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
index 15a5da0..777de02 100644
--- a/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
+++ b/erpnext/hr/report/employee_leave_balance_summary/employee_leave_balance_summary.py
@@ -75,7 +75,7 @@
 			
 			leave_approvers = department_approver_map.get(employee.department_name, []).append(employee.leave_approver)
 
-			if (len(leave_approvers) and user in leave_approvers) or (user in ["Administrator", employee.user_id]) \
+			if (leave_approvers and len(leave_approvers) and user in leave_approvers) or (user in ["Administrator", employee.user_id]) \
 				or ("HR Manager" in frappe.get_roles(user)):
 				row = frappe._dict({
 					'employee': employee.name,
@@ -111,10 +111,10 @@
 def get_department_leave_approver_map(department=None):
 	conditions=''
 	if department:
-		conditions='and department_name = %(department)s or parent_department = %(department)s'%{'department': department}
+		conditions="and (department_name = '%(department)s' or parent_department = '%(department)s')"%{'department': department}
 
 	# get current department and all its child
-	department_list = frappe.db.sql_list(''' SELECT name FROM `tabDepartment` WHERE disabled=0 {0}'''.format(conditions)) #nosec
+	department_list = frappe.db.sql_list(""" SELECT name FROM `tabDepartment` WHERE disabled=0 {0}""".format(conditions)) #nosec
 
 	# retrieve approvers list from current department and from its subsequent child departments
 	approver_list = frappe.get_all('Department Approver', filters={
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
index ce95db3..e940b60 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -20,6 +20,12 @@
 			frm.set_value({transaction_date: frappe.datetime.get_today()});
 		}
 	},
+	refresh: function(frm) {
+		setTimeout(() => {
+			frm.toggle_display('generate_schedule', !(frm.is_new()));
+			frm.toggle_display('schedule', !(frm.is_new()));
+		},10);
+	},
 	customer: function(frm) {
 		erpnext.utils.get_party_details(frm)
 	},
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 3a64e1a..94d85f7 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -150,7 +150,7 @@
 			elif not d.no_of_visits:
 				throw(_("Please mention no of visits required"))
 			elif not d.sales_person:
-				throw(_("Please select Incharge Person's name"))
+				throw(_("Please select a Sales Person for item: {0}".format(d.item_name)))
 
 			if getdate(d.start_date) >= getdate(d.end_date):
 				throw(_("Start date should be less than end date for Item {0}").format(d.item_code))
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
index 0bbf689..1cd9446 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
@@ -12,6 +12,7 @@
 	},
 
 	refresh: function(frm) {
+		erpnext.hide_company();
 		if (frm.doc.customer && frm.doc.docstatus === 1) {
 			frm.add_custom_button(__('View Orders'), function() {
 				frappe.set_route('List', 'Sales Order', {blanket_order: frm.doc.name});
@@ -51,11 +52,19 @@
 
 	set_tc_name_filter: function(frm) {
 		if (frm.doc.blanket_order_type === 'Selling') {
+			frm.set_df_property("customer","reqd", 1);
+			frm.set_df_property("supplier","reqd", 0);
+			frm.set_value("supplier", "");
+
 			frm.set_query("tc_name", function() {
 				return { filters: { selling: 1 } };
 			});
 		}
 		if (frm.doc.blanket_order_type === 'Purchasing') {
+			frm.set_df_property("supplier","reqd", 1);
+			frm.set_df_property("customer","reqd", 0);
+			frm.set_value("customer", "");
+
 			frm.set_query("tc_name", function() {
 				return { filters: { buying: 1 } };
 			});
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
index 570d435..260e0b8 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
@@ -88,7 +88,8 @@
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "reqd": 1
   },
   {
    "fieldname": "section_break_12",
@@ -128,7 +129,7 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-06-19 11:59:09.279607",
+ "modified": "2019-10-16 13:38:32.302316",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Blanket Order",
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
index 822c7fc..faed707 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
@@ -4,13 +4,21 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import flt
+from frappe import _
+from frappe.utils import flt, getdate
 from frappe.model.document import Document
 from frappe.model.mapper import get_mapped_doc
 from erpnext.stock.doctype.item.item import get_item_defaults
 
 
 class BlanketOrder(Document):
+	def validate(self):
+		self.validate_dates()
+
+	def validate_dates(self):
+		if getdate(self.from_date) > getdate(self.to_date):
+			frappe.throw(_("From date cannot be greater than To date")) 
+
 	def update_ordered_qty(self):
 		ref_doctype = "Sales Order" if self.blanket_order_type == "Selling" else "Purchase Order"
 		item_ordered_qty = frappe._dict(frappe.db.sql("""
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 9248ac0..b9591d6 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -117,7 +117,7 @@
 			args: {
 				update_parent: true,
 				from_child_bom:false,
-				save: false
+				save: frm.doc.docstatus === 1 ? true : false
 			},
 			callback: function(r) {
 				refresh_field("items");
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index eb01b8c..c849f5b 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -35,12 +35,15 @@
 			# name can be BOM/ITEM/001, BOM/ITEM/001-1, BOM-ITEM-001, BOM-ITEM-001-1
 
 			# split by item
-			names = [name.split(self.item)[-1][1:] for name in names]
+			names = [name.split(self.item, 1) for name in names]
+			names = [d[-1][1:] for d in filter(lambda x: len(x) > 1 and x[-1], names)]
 
 			# split by (-) if cancelled
-			names = [cint(name.split('-')[-1]) for name in names]
-
-			idx = max(names) + 1
+			if names:
+				names = [cint(name.split('-')[-1]) for name in names]
+				idx = max(names) + 1
+			else:
+				idx = 1
 		else:
 			idx = 1
 
@@ -289,7 +292,8 @@
 		return valuation_rate
 
 	def manage_default_bom(self):
-		""" Uncheck others if current one is selected as default,
+		""" Uncheck others if current one is selected as default or
+			check the current one as default if it the only bom for the selected item,
 			update default bom in item master
 		"""
 		if self.is_default and self.is_active:
@@ -298,6 +302,9 @@
 			item = frappe.get_doc("Item", self.item)
 			if item.default_bom != self.name:
 				frappe.db.set_value('Item', self.item, 'default_bom', self.name)
+		elif not frappe.db.exists(dict(doctype='BOM', docstatus=1, item=self.item, is_default=1)) \
+			and self.is_active:
+			frappe.db.set(self, "is_default", 1)
 		else:
 			frappe.db.set(self, "is_default", 0)
 			item = frappe.get_doc("Item", self.item)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 2aeea58..4b654b4 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -103,7 +103,7 @@
 								${__('Reserved Qty for Production: Raw materials quantity to make manufacturing items.')}
 							</li>
 							<li>
-								${__('Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.')}
+								${__('Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.')}
 							</li>
 						</ul>
 					</div>
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index f70c9cc..4479641 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -11,9 +11,11 @@
 from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.manufacturing.doctype.production_plan.production_plan import get_items_for_material_requests
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 
 class TestProductionPlan(unittest.TestCase):
 	def setUp(self):
+		set_perpetual_inventory(0)
 		for item in ['Test Production Item 1', 'Subassembly Item 1',
 			'Raw Material Item 1', 'Raw Material Item 2']:
 			create_item(item, valuation_rate=100)
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index d710e57..ea2e7a9 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -17,11 +17,11 @@
 
 class TestWorkOrder(unittest.TestCase):
 	def setUp(self):
+		set_perpetual_inventory(0)
 		self.warehouse = '_Test Warehouse 2 - _TC'
 		self.item = '_Test Item'
 
 	def check_planned_qty(self):
-		set_perpetual_inventory(0)
 
 		planned0 = frappe.db.get_value("Bin", {"item_code": "_Test FG Item",
 			"warehouse": "_Test Warehouse 1 - _TC"}, "planned_qty") or 0
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index 1789a1f..cdbce33 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -342,7 +342,7 @@
 	},
 
 	project: function(frm) {
-		if(!erpnext.in_production_item_onchange) {
+		if(!erpnext.in_production_item_onchange && !frm.doc.bom_no) {
 			frm.trigger("production_item");
 		}
 	},
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 9f98099..ee6bdff 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -640,3 +640,4 @@
 erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order
 erpnext.patches.v12_0.generate_leave_ledger_entries
 erpnext.patches.v12_0.set_default_shopify_app_type
+erpnext.patches.v12_0.replace_accounting_with_accounts_in_home_settings
diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
index 5c18985..3d1a88e 100644
--- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
+++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
@@ -4,7 +4,7 @@
 
 
 def execute():
-	frappe.reload_doc('desk', 'doctype', 'auto_repeat')
+	frappe.reload_doc('automation', 'doctype', 'auto_repeat')
 
 	doctypes_to_rename = {
 		'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'],
@@ -41,4 +41,4 @@
 		if field in frappe.db.get_table_columns("Subscription"):
 			fields_to_drop['Subscription'].append(field)
 
-	frappe.model.delete_fields(fields_to_drop, delete=1)
\ No newline at end of file
+	frappe.model.delete_fields(fields_to_drop, delete=1)
diff --git a/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py
new file mode 100644
index 0000000..09fc4c1
--- /dev/null
+++ b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py
@@ -0,0 +1,5 @@
+import frappe
+
+def execute():
+	frappe.db.sql("""UPDATE `tabUser` SET `home_settings` = REPLACE(`home_settings`, 'Accounting', 'Accounts')""")
+	frappe.cache().delete_key('home_settings')
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 9ee2927..bc88250 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -353,17 +353,35 @@
 def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
 	user = frappe.session.user
 	# find customer name from contact.
-	customer = frappe.db.sql('''SELECT dl.link_name FROM `tabContact` AS c inner join \
-		`tabDynamic Link` AS dl ON c.first_name=dl.link_name WHERE c.email_id=%s''',user)
+	customer = ''
+	timesheets = []
+
+	contact = frappe.db.exists('Contact', {'user': user})
+	if contact:
+		# find customer
+		contact = frappe.get_doc('Contact', contact)
+		customer = contact.get_link_for('Customer')
 
 	if customer:
-		# find list of Sales Invoice for made for customer.
-		sales_invoice = frappe.db.sql('''SELECT name FROM `tabSales Invoice` WHERE customer = %s''',customer)
+		sales_invoices = [d.name for d in frappe.get_all('Sales Invoice', filters={'customer': customer})] or [None]
+		projects = [d.name for d in frappe.get_all('Project', filters={'customer': customer})]
 		# Return timesheet related data to web portal.
-		return frappe. db.sql('''SELECT ts.name, tsd.activity_type, ts.status, ts.total_billable_hours, \
-			tsd.sales_invoice, tsd.project  FROM `tabTimesheet` AS ts inner join `tabTimesheet Detail` \
-			AS tsd ON tsd.parent = ts.name where tsd.sales_invoice IN %s order by\
-			end_date asc limit {0} , {1}'''.format(limit_start, limit_page_length), [sales_invoice], as_dict = True)
+		timesheets = frappe.db.sql('''
+			SELECT
+				ts.name, tsd.activity_type, ts.status, ts.total_billable_hours,
+				COALESCE(ts.sales_invoice, tsd.sales_invoice) AS sales_invoice, tsd.project
+			FROM `tabTimesheet` ts, `tabTimesheet Detail` tsd
+			WHERE tsd.parent = ts.name AND
+				(
+					ts.sales_invoice IN %(sales_invoices)s OR
+					tsd.sales_invoice IN %(sales_invoices)s OR
+					tsd.project IN %(projects)s
+				)
+			ORDER BY `end_date` ASC
+			LIMIT {0}, {1}
+		'''.format(limit_start, limit_page_length), dict(sales_invoices=sales_invoices, projects=projects), as_dict=True) #nosec
+
+	return timesheets
 
 def get_list_context(context=None):
 	return {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a9b19ed..ca492ba 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1233,7 +1233,8 @@
 			"is_return": cint(me.frm.doc.is_return),
 			"update_stock": in_list(['Sales Invoice', 'Purchase Invoice'], me.frm.doc.doctype) ? cint(me.frm.doc.update_stock) : 0,
 			"conversion_factor": me.frm.doc.conversion_factor,
-			"pos_profile": me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : ''
+			"pos_profile": me.frm.doc.doctype == 'Sales Invoice' ? me.frm.doc.pos_profile : '',
+			"coupon_code": me.frm.doc.coupon_code
 		};
 	},
 
@@ -1652,6 +1653,11 @@
 				'item_code': item.item_code,
 				'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(),
 			}
+
+			if (doc.is_return) {
+				filters["is_return"] = 1;
+			}
+
 			if (item.warehouse) filters["warehouse"] = item.warehouse;
 
 			return {
@@ -1742,6 +1748,15 @@
 				frappe.model.set_value(me.frm.doctype + " Item", item.name, "warehouse", me.frm.doc.set_warehouse);
 			});
 		}
+	},
+	coupon_code: function() {
+		var me = this;
+		frappe.run_serially([
+			() => this.frm.doc.ignore_pricing_rule=1,
+			() => me.ignore_pricing_rule(),
+			() => this.frm.doc.ignore_pricing_rule=0,
+			() => me.apply_pricing_rule()
+		]);
 	}
 });
 
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 5a05268..44a8cd0 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -5,6 +5,19 @@
 frappe.provide("erpnext.shopping_cart");
 var shopping_cart = erpnext.shopping_cart;
 
+var getParams = function (url) {
+	var params = [];
+	var parser = document.createElement('a');
+	parser.href = url;
+	var query = parser.search.substring(1);
+	var vars = query.split('&');
+	for (var i = 0; i < vars.length; i++) {
+		var pair = vars[i].split('=');
+		params[pair[0]] = decodeURIComponent(pair[1]);
+	}
+	return params;
+};
+
 frappe.ready(function() {
 	var full_name = frappe.session && frappe.session.user_fullname;
 	// update user
@@ -12,7 +25,32 @@
 		$('.navbar li[data-label="User"] a')
 			.html('<i class="fa fa-fixed-width fa fa-user"></i> ' + full_name);
 	}
+	// set coupon code and sales partner code
 
+	var url_args = getParams(window.location.href);
+
+	var referral_coupon_code = url_args['cc'];
+	var referral_sales_partner = url_args['sp'];
+
+	var d = new Date();
+	// expires within 30 minutes
+	d.setTime(d.getTime() + (0.02 * 24 * 60 * 60 * 1000));
+	var expires = "expires="+d.toUTCString();
+	if (referral_coupon_code) {
+		document.cookie = "referral_coupon_code=" + referral_coupon_code + ";" + expires + ";path=/";
+	}
+	if (referral_sales_partner) {
+		document.cookie = "referral_sales_partner=" + referral_sales_partner + ";" + expires + ";path=/";
+	}
+	referral_coupon_code=frappe.get_cookie("referral_coupon_code");
+	referral_sales_partner=frappe.get_cookie("referral_sales_partner");
+
+	if (referral_coupon_code && $(".tot_quotation_discount").val()==undefined ) {
+		$(".txtcoupon").val(referral_coupon_code);
+	}
+	if (referral_sales_partner) {
+		$(".txtreferral_sales_partner").val(referral_sales_partner);
+	}
 	// update login
 	shopping_cart.show_shoppingcart_dropdown();
 	shopping_cart.set_cart_count();
diff --git a/erpnext/regional/doctype/datev_settings/__init__.py b/erpnext/regional/doctype/datev_settings/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/regional/doctype/datev_settings/__init__.py
diff --git a/erpnext/regional/doctype/datev_settings/datev_settings.js b/erpnext/regional/doctype/datev_settings/datev_settings.js
new file mode 100644
index 0000000..69747b0
--- /dev/null
+++ b/erpnext/regional/doctype/datev_settings/datev_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('DATEV Settings', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/erpnext/regional/doctype/datev_settings/datev_settings.json b/erpnext/regional/doctype/datev_settings/datev_settings.json
new file mode 100644
index 0000000..6860ed3
--- /dev/null
+++ b/erpnext/regional/doctype/datev_settings/datev_settings.json
@@ -0,0 +1,105 @@
+{
+ "autoname": "field:client",
+ "creation": "2019-08-13 23:56:34.259906",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "client",
+  "column_break_2",
+  "client_number",
+  "section_break_4",
+  "consultant",
+  "column_break_6",
+  "consultant_number"
+ ],
+ "fields": [
+  {
+   "fieldname": "client",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Client",
+   "options": "Company",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "client_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Client ID",
+   "reqd": 1
+  },
+  {
+   "fieldname": "consultant",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Consultant",
+   "options": "Supplier"
+  },
+  {
+   "fieldname": "consultant_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Consultant ID",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  }
+ ],
+ "modified": "2019-08-14 00:03:26.616460",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "DATEV Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/regional/doctype/datev_settings/datev_settings.py b/erpnext/regional/doctype/datev_settings/datev_settings.py
new file mode 100644
index 0000000..cff5bba
--- /dev/null
+++ b/erpnext/regional/doctype/datev_settings/datev_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class DATEVSettings(Document):
+	pass
diff --git a/erpnext/regional/doctype/datev_settings/test_datev_settings.py b/erpnext/regional/doctype/datev_settings/test_datev_settings.py
new file mode 100644
index 0000000..0271329
--- /dev/null
+++ b/erpnext/regional/doctype/datev_settings/test_datev_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestDATEVSettings(unittest.TestCase):
+	pass
diff --git a/erpnext/regional/report/datev/datev.py b/erpnext/regional/report/datev/datev.py
index 50aed08..ee8735f 100644
--- a/erpnext/regional/report/datev/datev.py
+++ b/erpnext/regional/report/datev/datev.py
@@ -8,6 +8,7 @@
   all required columns. Used to import the data into the DATEV Software.
 """
 from __future__ import unicode_literals
+import datetime
 import json
 from six import string_types
 import frappe
@@ -17,24 +18,28 @@
 
 def execute(filters=None):
 	"""Entry point for frappe."""
-	validate_filters(filters)
+	validate(filters)
 	result = get_gl_entries(filters, as_dict=0)
 	columns = get_columns()
 
 	return columns, result
 
 
-def validate_filters(filters):
-	"""Make sure all mandatory filters are present."""
+def validate(filters):
+	"""Make sure all mandatory filters and settings are present."""
 	if not filters.get('company'):
-		frappe.throw(_('{0} is mandatory').format(_('Company')))
+		frappe.throw(_('<b>Company</b> is a mandatory filter.'))
 
 	if not filters.get('from_date'):
-		frappe.throw(_('{0} is mandatory').format(_('From Date')))
+		frappe.throw(_('<b>From Date</b> is a mandatory filter.'))
 
 	if not filters.get('to_date'):
-		frappe.throw(_('{0} is mandatory').format(_('To Date')))
+		frappe.throw(_('<b>To Date</b> is a mandatory filter.'))
 
+	try:
+		frappe.get_doc('DATEV Settings', filters.get('company'))
+	except frappe.DoesNotExistError:
+		frappe.throw(_('Please create <b>DATEV Settings</b> for Company <b>{}</b>.').format(filters.get('company')))
 
 def get_columns():
 	"""Return the list of columns that will be shown in query report."""
@@ -158,13 +163,84 @@
 	return gl_entries
 
 
-def get_datev_csv(data):
+def get_datev_csv(data, filters):
 	"""
 	Fill in missing columns and return a CSV in DATEV Format.
 
+	For automatic processing, DATEV requires the first line of the CSV file to
+	hold meta data such as the length of account numbers oder the category of
+	the data.
+
 	Arguments:
 	data -- array of dictionaries
+	filters -- dict
 	"""
+	header = [
+		# A = DATEV format
+		#   DTVF = created by DATEV software,
+		#   EXTF = created by other software
+		"EXTF",
+		# B = version of the DATEV format
+		#   141 = 1.41, 
+		#   510 = 5.10,
+		#   720 = 7.20
+		"510",
+		# C = Data category
+		#   21 = Transaction batch (Buchungsstapel),
+		#   67 = Buchungstextkonstanten,
+		#   16 = Debitors/Creditors,
+		#   20 = Account names (Kontenbeschriftungen)
+		"21",
+		# D = Format name
+		#   Buchungsstapel,
+		#   Buchungstextkonstanten,
+		#   Debitoren/Kreditoren,
+		#   Kontenbeschriftungen
+		"Buchungsstapel",
+		# E = Format version (regarding format name)
+		"",
+		# F = Generated on
+		datetime.datetime.now().strftime("%Y%m%d"),
+		# G = Imported on -- stays empty
+		"",
+		# H = Origin (SV = other (?), RE = KARE)
+		"SV",
+		# I = Exported by
+		frappe.session.user,
+		# J = Imported by -- stays empty
+		"",
+		# K = Tax consultant number (Beraternummer)
+		frappe.get_value("DATEV Settings", filters.get("company"), "consultant_number") or "",
+		"",
+		# L = Tax client number (Mandantennummer)
+		frappe.get_value("DATEV Settings", filters.get("company"), "client_number") or "",
+		"",
+		# M = Start of the fiscal year (Wirtschaftsjahresbeginn)
+		frappe.utils.formatdate(frappe.defaults.get_user_default("year_start_date"), "yyyyMMdd"),
+		# N = Length of account numbers (Sachkontenlänge)
+		"4",
+		# O = Transaction batch start date (YYYYMMDD)
+		frappe.utils.formatdate(filters.get('from_date'), "yyyyMMdd"),
+		# P = Transaction batch end date (YYYYMMDD)
+		frappe.utils.formatdate(filters.get('to_date'), "yyyyMMdd"),
+		# Q = Description (for example, "January - February 2019 Transactions")
+		"{} - {} Buchungsstapel".format(
+			frappe.utils.formatdate(filters.get('from_date'), "MMMM yyyy"),
+			frappe.utils.formatdate(filters.get('to_date'), "MMMM yyyy")
+		),
+		# R = Diktatkürzel
+		"",
+		# S = Buchungstyp
+		#   1 = Transaction batch (Buchungsstapel),
+		#   2 = Annual financial statement (Jahresabschluss)
+		"1",
+		# T = Rechnungslegungszweck
+		"",
+		# U = Festschreibung
+		"",
+		# V = Kontoführungs-Währungskennzeichen des Geldkontos
+		frappe.get_value("Company", filters.get("company"), "default_currency")
+	]
 	columns = [
 		# All possible columns must tbe listed here, because DATEV requires them to
 		# be present in the CSV.
@@ -324,9 +400,10 @@
 	data_df = pd.DataFrame.from_records(data)
 
 	result = empty_df.append(data_df)
-	result["Belegdatum"] = pd.to_datetime(result["Belegdatum"])
+	result['Belegdatum'] = pd.to_datetime(result['Belegdatum'])
 
-	return result.to_csv(
+	header = ';'.join(header).encode('latin_1')
+	data = result.to_csv(
 		sep=b';',
 		# European decimal seperator
 		decimal=',',
@@ -342,6 +419,7 @@
 		columns=columns
 	)
 
+	return header + b'\r\n' + data
 
 @frappe.whitelist()
 def download_datev_csv(filters=None):
@@ -359,15 +437,9 @@
 	if isinstance(filters, string_types):
 		filters = json.loads(filters)
 
-	validate_filters(filters)
+	validate(filters)
 	data = get_gl_entries(filters, as_dict=1)
 
-	filename = 'DATEV_Buchungsstapel_{}-{}_bis_{}'.format(
-		filters.get('company'),
-		filters.get('from_date'),
-		filters.get('to_date')
-	)
-
-	frappe.response['result'] = get_datev_csv(data)
-	frappe.response['doctype'] = filename
+	frappe.response['result'] = get_datev_csv(data, filters)
+	frappe.response['doctype'] = 'EXTF_Buchungsstapel'
 	frappe.response['type'] = 'csv'
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 42c7d99..87fdaa3 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -8,7 +8,7 @@
 
 from erpnext.accounts.party import get_due_date
 from frappe.test_runner import make_test_records
-from erpnext.exceptions import PartyFrozen
+from erpnext.exceptions import PartyFrozen, PartyDisabled
 from frappe.utils import flt
 from erpnext.selling.doctype.customer.customer import get_credit_limit, get_customer_outstanding
 from erpnext.tests.utils import create_test_contact_and_address
@@ -178,7 +178,7 @@
 
 		so = make_sales_order(do_not_save=True)
 
-		self.assertRaises(frappe.ValidationError, so.save)
+		self.assertRaises(PartyDisabled, so.save)
 
 		frappe.db.set_value("Customer", "_Test Customer", "disabled", 0)
 
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index fb5336b..12f3260 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -23,9 +23,6 @@
 	refresh: function(frm) {
 		frm.trigger("set_label");
 		frm.trigger("set_dynamic_field_label");
-		if (frm.doc.quotation_to && frm.doc.party_name && !frm.doc.contact_person) {
-			frm.trigger("party_name");
-		}
 	},
 
 	quotation_to: function(frm) {
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 1b89545..ea04715 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1904,7 +1904,7 @@
      "in_global_search": 0,
      "in_list_view": 0,
      "in_standard_filter": 0,
-     "label": "Additional Discount",
+     "label": "Additional Discount and Coupon Code",
      "length": 0,
      "no_copy": 0,
      "permlevel": 0,
@@ -1921,6 +1921,74 @@
      "unique": 0
     },
     {
+     "allow_bulk_edit": 0, 
+     "allow_in_quick_entry": 0, 
+     "allow_on_submit": 0, 
+     "bold": 0, 
+     "collapsible": 0, 
+     "columns": 0, 
+     "fetch_if_empty": 0, 
+     "fieldname": "coupon_code", 
+     "fieldtype": "Link", 
+     "hidden": 0, 
+     "ignore_user_permissions": 0, 
+     "ignore_xss_filter": 0, 
+     "in_filter": 0, 
+     "in_global_search": 0, 
+     "in_list_view": 0, 
+     "in_standard_filter": 0, 
+     "label": "Coupon Code", 
+     "length": 0, 
+     "no_copy": 0, 
+     "options": "Coupon Code", 
+     "permlevel": 0, 
+     "precision": "", 
+     "print_hide": 0, 
+     "print_hide_if_no_value": 0, 
+     "read_only": 0, 
+     "remember_last_selected_value": 0, 
+     "report_hide": 0, 
+     "reqd": 0, 
+     "search_index": 0, 
+     "set_only_once": 0, 
+     "translatable": 0, 
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0, 
+     "allow_in_quick_entry": 0, 
+     "allow_on_submit": 0, 
+     "bold": 0, 
+     "collapsible": 0, 
+     "columns": 0, 
+     "fetch_if_empty": 0, 
+     "fieldname": "referral_sales_partner", 
+     "fieldtype": "Link", 
+     "hidden": 0, 
+     "ignore_user_permissions": 0, 
+     "ignore_xss_filter": 0, 
+     "in_filter": 0, 
+     "in_global_search": 0, 
+     "in_list_view": 0, 
+     "in_standard_filter": 0, 
+     "label": "Referral Sales Partner", 
+     "length": 0, 
+     "no_copy": 0, 
+     "options": "Sales Partner", 
+     "permlevel": 0, 
+     "precision": "", 
+     "print_hide": 0, 
+     "print_hide_if_no_value": 0, 
+     "read_only": 0, 
+     "remember_last_selected_value": 0, 
+     "report_hide": 0, 
+     "reqd": 0, 
+     "search_index": 0, 
+     "set_only_once": 0, 
+     "translatable": 0, 
+     "unique": 0
+    },
+    {
      "allow_bulk_edit": 0,
      "allow_in_quick_entry": 0,
      "allow_on_submit": 0,
@@ -3263,7 +3331,7 @@
    "istable": 0,
    "max_attachments": 1,
    "menu_index": 0,
-   "modified": "2019-06-26 01:00:21.545591",
+   "modified": "2019-10-14 01:00:21.545591",
    "modified_by": "Administrator",
    "module": "Selling",
    "name": "Quotation",
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 46009f4..4a56e40 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -142,6 +142,9 @@
 		if customer:
 			target.customer = customer.name
 			target.customer_name = customer.customer_name
+		if source.referral_sales_partner:
+			target.sales_partner=source.referral_sales_partner
+			target.commission_rate=frappe.get_value('Sales Partner', source.referral_sales_partner, 'commission_rate')
 		target.ignore_pricing_rule = 1
 		target.flags.ignore_permissions = ignore_permissions
 		target.run_method("set_missing_values")
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 3885b13..ccc48e1 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -79,6 +79,7 @@
   "loyalty_points",
   "loyalty_amount",
   "section_break_48",
+  "coupon_code",
   "apply_discount_on",
   "base_discount_amount",
   "column_break_50",
@@ -678,7 +679,13 @@
    "collapsible_depends_on": "discount_amount",
    "fieldname": "section_break_48",
    "fieldtype": "Section Break",
-   "label": "Additional Discount"
+   "label": "Additional Discount and Coupon Code"
+  },
+  {
+   "fieldname": "coupon_code",
+   "fieldtype": "Link",
+   "label": "Coupon Code",
+   "options": "Coupon Code"
   },
   {
    "default": "Grand Total",
@@ -1178,6 +1185,7 @@
    "default": "0",
    "fieldname": "skip_delivery_note",
    "fieldtype": "Check",
+   "hidden": 1,
    "label": "Skip Delivery Note",
    "print_hide": 1
   }
@@ -1185,7 +1193,7 @@
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-10-10 08:46:07.540565",
+ "modified": "2019-10-22 14:26:42.767189",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 80784ea..c4c3c0f 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -46,6 +46,10 @@
 		self.validate_serial_no_based_delivery()
 		validate_inter_company_party(self.doctype, self.customer, self.company, self.inter_company_order_reference)
 
+		if self.coupon_code:
+			from erpnext.accounts.doctype.pricing_rule.utils import validate_coupon_code
+			validate_coupon_code(self.coupon_code)
+
 		from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
 		make_packing_list(self)
 
@@ -177,6 +181,9 @@
 		self.update_blanket_order()
 
 		update_linked_doc(self.doctype, self.name, self.inter_company_order_reference)
+		if self.coupon_code:
+			from erpnext.accounts.doctype.pricing_rule.utils import update_coupon_code_count
+			update_coupon_code_count(self.coupon_code,'used')
 
 	def on_cancel(self):
 		super(SalesOrder, self).on_cancel()
@@ -195,6 +202,9 @@
 		self.update_blanket_order()
 
 		unlink_inter_company_doc(self.doctype, self.name, self.inter_company_order_reference)
+		if self.coupon_code:
+			from erpnext.accounts.doctype.pricing_rule.utils import update_coupon_code_count
+			update_coupon_code_count(self.coupon_code,'cancelled')
 
 	def update_project(self):
 		if frappe.db.get_single_value('Selling Settings', 'sales_update_frequency') != "Each Transaction":
@@ -651,12 +661,15 @@
 
 		if source_parent.project:
 			target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center")
-		if not target.cost_center and target.item_code:
+		if target.item_code:
 			item = get_item_defaults(target.item_code, source_parent.company)
 			item_group = get_item_group_defaults(target.item_code, source_parent.company)
-			target.cost_center = item.get("selling_cost_center") \
+			cost_center = item.get("selling_cost_center") \
 				or item_group.get("selling_cost_center")
 
+			if cost_center:
+				target.cost_center = cost_center
+
 	doclist = get_mapped_doc("Sales Order", source_name, {
 		"Sales Order": {
 			"doctype": "Sales Invoice",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 9eb3748..8b42b19 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -33,6 +33,10 @@
 		return exists
 
 	def validate(self):
+		self.update_default_account = False
+		if self.is_new():
+			self.update_default_account = True
+
 		self.validate_abbr()
 		self.validate_default_accounts()
 		self.validate_currency()
@@ -203,8 +207,8 @@
 				"default_expense_account": "Cost of Goods Sold"
 			})
 
-		for default_account in default_accounts:
-			if self.is_new() or frappe.flags.in_test:
+		if self.update_default_account or frappe.flags.in_test:
+			for default_account in default_accounts:
 				self._set_default_account(default_account, default_accounts.get(default_account))
 
 		if not self.default_income_account:
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index 8debef5..8d9c23a 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -22,7 +22,7 @@
 		company.create_chart_of_accounts_based_on = "Existing Company"
 		company.existing_company = "_Test Company"
 		company.save()
-		
+
 		expected_results = {
 			"Debtors - CFEC": {
 				"account_type": "Receivable",
@@ -37,7 +37,7 @@
 				"parent_account": "Cash In Hand - CFEC"
 			}
 		}
-		
+
 		for account, acc_property in expected_results.items():
 			acc = frappe.get_doc("Account", account)
 			for prop, val in acc_property.items():
@@ -50,14 +50,14 @@
 		countries = ["India", "Brazil", "United Arab Emirates", "Canada", "Germany", "France",
 			"Guatemala", "Indonesia", "Italy", "Mexico", "Nicaragua", "Netherlands", "Singapore",
 			"Brazil", "Argentina", "Hungary", "Taiwan"]
-		
+
 		for country in countries:
 			templates = get_charts_for_country(country)
 			if len(templates) != 1 and "Standard" in templates:
 				templates.remove("Standard")
-			
+
 			self.assertTrue(templates)
-			
+
 			for template in templates:
 				try:
 					company = frappe.new_doc("Company")
@@ -67,11 +67,11 @@
 					company.create_chart_of_accounts_based_on = "Standard Template"
 					company.chart_of_accounts = template
 					company.save()
-				
-					account_types = ["Cost of Goods Sold", "Depreciation", 
-						"Expenses Included In Valuation", "Fixed Asset", "Payable", "Receivable", 
+
+					account_types = ["Cost of Goods Sold", "Depreciation",
+						"Expenses Included In Valuation", "Fixed Asset", "Payable", "Receivable",
 						"Stock Adjustment", "Stock Received But Not Billed", "Bank", "Cash", "Stock"]
-				
+
 					for account_type in account_types:
 						filters = {
 							"company": template,
diff --git a/erpnext/setup/doctype/company/test_records.json b/erpnext/setup/doctype/company/test_records.json
index 58d8b5c..2130241 100644
--- a/erpnext/setup/doctype/company/test_records.json
+++ b/erpnext/setup/doctype/company/test_records.json
@@ -62,5 +62,16 @@
 		"domain": "Manufacturing",
 		"chart_of_accounts": "Standard",
 		"default_holiday_list": "_Test Holiday List"
+	},
+	{
+		"abbr": "TCP1",
+		"company_name": "_Test Company with perpetual inventory",
+		"country": "India",
+		"default_currency": "INR",
+		"doctype": "Company",
+		"domain": "Manufacturing",
+		"chart_of_accounts": "Standard",
+		"enable_perpetual_inventory": 1,
+		"default_holiday_list": "_Test Holiday List"
 	}
 ]
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 7164add..5656d43 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -24,5 +24,11 @@
 				}
 			}
 		};
+	},
+	referral_code:function(frm){
+		if (frm.doc.referral_code) {
+			frm.doc.referral_code=frm.doc.referral_code.toUpperCase();
+			frm.refresh_field('referral_code');
+		}
 	}
 });
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 28cdd3e..0bf9d71 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -517,6 +517,73 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
+   "fieldname": "column_break_16", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "", 
+   "description": "To Track inbound purchase", 
+   "fetch_if_empty": 0, 
+   "fieldname": "referral_code", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Referral Code", 
+   "length": 8, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 1
+  },
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "depends_on": "show_in_website", 
    "fetch_if_empty": 0, 
    "fieldname": "section_break_17", 
@@ -779,7 +846,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2019-03-21 16:26:45.447265", 
+ "modified": "2019-10-14 16:26:45.447265", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 66598f4..ebd7b50 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -65,7 +65,7 @@
 		{'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'),
 			'allow_encashment': 1, 'is_carry_forward': 1, 'max_continuous_days_allowed': '3', 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
-			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
+			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1, 'is_compensatory':1 },
 		{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'),
 			'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
 		{'doctype': 'Leave Type', 'leave_type_name': _('Privilege Leave'), 'name': _('Privilege Leave'),
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 40cb7c8..a4c10cf 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -66,7 +66,7 @@
 	from erpnext.selling.doctype.quotation.quotation import _make_sales_order
 	sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
 
-	if not cart_settings.allow_items_not_in_stock:
+	if not cint(cart_settings.allow_items_not_in_stock):
 		for item in sales_order.get("items"):
 			item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
 				item.item_code, ["website_warehouse", "is_stock_item"])
@@ -537,3 +537,29 @@
 
 def show_terms(doc):
 	return doc.tc_name
+
+@frappe.whitelist(allow_guest=True)
+def apply_coupon_code(applied_code,applied_referral_sales_partner):
+	quotation = True
+	if applied_code:
+		coupon_list=frappe.get_all('Coupon Code', filters={"docstatus": ("<", "2"), 'coupon_code':applied_code }, fields=['name'])
+		if coupon_list:
+			coupon_name=coupon_list[0].name
+			from erpnext.accounts.doctype.pricing_rule.utils import validate_coupon_code
+			validate_coupon_code(coupon_name)
+			quotation = _get_cart_quotation()
+			quotation.coupon_code=coupon_name
+			quotation.flags.ignore_permissions = True
+			quotation.save()
+			if applied_referral_sales_partner:
+				sales_partner_list=frappe.get_all('Sales Partner', filters={'docstatus': 0, 'referral_code':applied_referral_sales_partner }, fields=['name'])
+				if sales_partner_list:
+					sales_partner_name=sales_partner_list[0].name
+					quotation.referral_sales_partner=sales_partner_name
+					quotation.flags.ignore_permissions = True
+					quotation.save()
+		else:
+			frappe.throw(_("Please enter valid coupon code !!"))
+	else:
+		frappe.throw(_("Please enter coupon code !!"))
+	return quotation
\ No newline at end of file
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 8b9299e..e828f54 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
@@ -276,6 +276,40 @@
      "unique": 0
     },
     {
+     "allow_bulk_edit": 0, 
+     "allow_in_quick_entry": 0, 
+     "allow_on_submit": 0, 
+     "bold": 0, 
+     "collapsible": 0, 
+     "columns": 0, 
+     "depends_on": "", 
+     "fetch_if_empty": 0, 
+     "fieldname": "show_apply_coupon_code_in_website", 
+     "fieldtype": "Check", 
+     "hidden": 0, 
+     "ignore_user_permissions": 0, 
+     "ignore_xss_filter": 0, 
+     "in_filter": 0, 
+     "in_global_search": 0, 
+     "in_list_view": 0, 
+     "in_standard_filter": 0, 
+     "label": "Show Apply Coupon Code", 
+     "length": 0, 
+     "no_copy": 0, 
+     "permlevel": 0, 
+     "precision": "", 
+     "print_hide": 0, 
+     "print_hide_if_no_value": 0, 
+     "read_only": 0, 
+     "remember_last_selected_value": 0, 
+     "report_hide": 0, 
+     "reqd": 0, 
+     "search_index": 0, 
+     "set_only_once": 0, 
+     "translatable": 0, 
+     "unique": 0
+    },
+    {
      "allow_bulk_edit": 0,
      "allow_in_quick_entry": 0,
      "allow_on_submit": 0,
@@ -679,7 +713,7 @@
    "issingle": 1,
    "istable": 0,
    "max_attachments": 0,
-   "modified": "2019-01-26 13:54:24.575322",
+   "modified": "2019-10-14 13:54:24.575322",
    "modified_by": "Administrator",
    "module": "Shopping Cart",
    "name": "Shopping Cart Settings",
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index 32a03e7..a4d4cbd 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -21,7 +21,7 @@
 			filters['company'] = company
 
 		for d in frappe.get_all('Warehouse',
-			fields = ["name", "account", "parent_warehouse", "company"],
+			fields = ["name", "account", "parent_warehouse", "company", "is_group"],
 			filters = filters,
 			order_by="lft, rgt"):
 			if not d.account:
diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py
index 56b4607..32445a6 100644
--- a/erpnext/stock/doctype/batch/test_batch.py
+++ b/erpnext/stock/doctype/batch/test_batch.py
@@ -8,10 +8,13 @@
 
 from erpnext.stock.doctype.batch.batch import get_batch_qty, UnableToSelectBatchError, get_batch_no
 from frappe.utils import cint
-
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 
 class TestBatch(unittest.TestCase):
 
+	def setUp(self):
+		set_perpetual_inventory(0)
+
 	def test_item_has_batch_enabled(self):
 		self.assertRaises(ValidationError, frappe.get_doc({
 			"doctype": "Batch",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
index 6fc51ec..0ae7c37 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_list.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js
@@ -6,9 +6,9 @@
 			return [__("Return"), "darkgrey", "is_return,=,Yes"];
 		} else if (doc.status === "Closed") {
 			return [__("Closed"), "green", "status,=,Closed"];
-		} else if (doc.grand_total !== 0 && flt(doc.per_billed, 2) < 100) {
+		} else if (flt(doc.per_billed, 2) < 100) {
 			return [__("To Bill"), "orange", "per_billed,<,100"];
-		} else if (doc.grand_total === 0 || flt(doc.per_billed, 2) == 100) {
+		} else if (flt(doc.per_billed, 2) == 100) {
 			return [__("Completed"), "green", "per_billed,=,100"];
 		}
 	},
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 91b6f4c..dc92c5c 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -20,18 +20,11 @@
 	import create_stock_reconciliation, set_valuation_method
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order, create_dn_against_so
 from erpnext.accounts.doctype.account.test_account import get_inventory_account, create_account
+from erpnext.stock.doctype.warehouse.test_warehouse import get_warehouse
 
 class TestDeliveryNote(unittest.TestCase):
-	def tearDown(self):
-		target_warehouse = "_Test Warehouse 1 - _TC"
-		company = "_Test Company"
-		if not frappe.db.exists("Account", target_warehouse):
-			parent_account = frappe.db.get_value('Account',
-				{'company': company, 'is_group':1, 'account_type': 'Stock'},'name')
-
-			account = create_account(account_name="_Test Warehouse 1", \
-				account_type="Stock", parent_account= parent_account, company=company)
-			frappe.db.set_value('Warehouse', target_warehouse, 'account', account)
+	def setUp(self):
+		set_perpetual_inventory(0)
 
 	def test_over_billing_against_dn(self):
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
@@ -68,17 +61,16 @@
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))
 
 	def test_delivery_note_gl_entry(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		set_valuation_method("_Test Item", "FIFO")
 
-		make_stock_entry(target="_Test Warehouse - _TC", qty=5, basic_rate=100)
+		make_stock_entry(target="Stores - TCP1", qty=5, basic_rate=100)
 
-		stock_in_hand_account = get_inventory_account('_Test Company')
+		stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
 		prev_bal = get_balance_on(stock_in_hand_account)
 
-		dn = create_delivery_note()
+		dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1")
 
 		gl_entries = get_gl_entries("Delivery Note", dn.name)
 		self.assertTrue(gl_entries)
@@ -88,7 +80,7 @@
 
 		expected_values = {
 			stock_in_hand_account: [0.0, stock_value_difference],
-			"Cost of Goods Sold - _TC": [stock_value_difference, 0.0]
+			"Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
 		}
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
@@ -98,7 +90,7 @@
 		self.assertEqual(bal, prev_bal - stock_value_difference)
 
 		# back dated incoming entry
-		make_stock_entry(posting_date=add_days(nowdate(), -2), target="_Test Warehouse - _TC",
+		make_stock_entry(posting_date=add_days(nowdate(), -2), target="Stores - TCP1",
 			qty=5, basic_rate=100)
 
 		gl_entries = get_gl_entries("Delivery Note", dn.name)
@@ -109,27 +101,25 @@
 
 		expected_values = {
 			stock_in_hand_account: [0.0, stock_value_difference],
-			"Cost of Goods Sold - _TC": [stock_value_difference, 0.0]
+			"Cost of Goods Sold - TCP1": [stock_value_difference, 0.0]
 		}
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
 
 		dn.cancel()
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))
-		set_perpetual_inventory(0, company)
 
 	def test_delivery_note_gl_entry_packing_item(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=10, basic_rate=100)
+		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", qty=10, basic_rate=100)
 		make_stock_entry(item_code="_Test Item Home Desktop 100",
-			target="_Test Warehouse - _TC", qty=10, basic_rate=100)
+			target="Stores - TCP1", qty=10, basic_rate=100)
 
-		stock_in_hand_account = get_inventory_account('_Test Company')
+		stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
 		prev_bal = get_balance_on(stock_in_hand_account)
 
-		dn = create_delivery_note(item_code="_Test Product Bundle Item")
+		dn = create_delivery_note(item_code="_Test Product Bundle Item", company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1")
 
 		stock_value_diff_rm1 = abs(frappe.db.get_value("Stock Ledger Entry",
 			{"voucher_type": "Delivery Note", "voucher_no": dn.name, "item_code": "_Test Item"},
@@ -146,7 +136,7 @@
 
 		expected_values = {
 			stock_in_hand_account: [0.0, stock_value_diff],
-			"Cost of Goods Sold - _TC": [stock_value_diff, 0.0]
+			"Cost of Goods Sold - TCP1": [stock_value_diff, 0.0]
 		}
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
@@ -158,8 +148,6 @@
 		dn.cancel()
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))
 
-		set_perpetual_inventory(0, company)
-
 	def test_serialized(self):
 		se = make_serialized_item()
 		serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
@@ -218,16 +206,16 @@
 			self.assertEqual(cstr(serial_no.get(field)), value)
 
 	def test_sales_return_for_non_bundled_items(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
+		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", qty=50, basic_rate=100)
 
-		actual_qty_0 = get_qty_after_transaction()
+		actual_qty_0 = get_qty_after_transaction(warehouse="Stores - TCP1")
 
-		dn = create_delivery_note(qty=5, rate=500)
+		dn = create_delivery_note(qty=5, rate=500, warehouse="Stores - TCP1", company=company,
+			expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
-		actual_qty_1 = get_qty_after_transaction()
+		actual_qty_1 = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty_0 - 5, actual_qty_1)
 
 		# outgoing_rate
@@ -235,9 +223,10 @@
 			"voucher_no": dn.name}, "stock_value_difference") / 5
 
 		# return entry
-		dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-2, rate=500)
+		dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-2, rate=500,
+			company=company, warehouse="Stores - TCP1", expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
-		actual_qty_2 = get_qty_after_transaction()
+		actual_qty_2 = get_qty_after_transaction(warehouse="Stores - TCP1")
 
 		self.assertEqual(actual_qty_1 + 2, actual_qty_2)
 
@@ -246,27 +235,29 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEqual(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
-		stock_in_hand_account = get_inventory_account('_Test Company', dn1.items[0].warehouse)
+		stock_in_hand_account = get_inventory_account(company, dn1.items[0].warehouse)
 
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Delivery Note",
 			"voucher_no": dn1.name, "account": stock_in_hand_account}, "debit")
 
 		self.assertEqual(gle_warehouse_amount, stock_value_difference)
 
-		set_perpetual_inventory(0, company)
-
 	def test_return_single_item_from_bundled_items(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
-		create_stock_reconciliation(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, rate=100)
-		create_stock_reconciliation(item_code="_Test Item Home Desktop 100", target="_Test Warehouse - _TC",
-			qty=50, rate=100)
+		create_stock_reconciliation(item_code="_Test Item",
+			warehouse="Stores - TCP1", qty=50, rate=100,
+			company=company, expense_account = "Stock Adjustment - TCP1")
+		create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
+			warehouse="Stores - TCP1", qty=50, rate=100,
+			company=company, expense_account = "Stock Adjustment - TCP1")
 
-		dn = create_delivery_note(item_code="_Test Product Bundle Item", qty=5, rate=500)
+		dn = create_delivery_note(item_code="_Test Product Bundle Item", qty=5, rate=500,
+			company=company, warehouse="Stores - TCP1",
+			expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
 		# Qty after delivery
-		actual_qty_1 = get_qty_after_transaction()
+		actual_qty_1 = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty_1,  25)
 
 		# outgoing_rate
@@ -274,10 +265,12 @@
 			"voucher_no": dn.name, "item_code": "_Test Item"}, "stock_value_difference") / 25
 
 		# return 'test item' from packed items
-		dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-10, rate=500)
+		dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-10, rate=500,
+			company=company, warehouse="Stores - TCP1",
+			expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
 		# qty after return
-		actual_qty_2 = get_qty_after_transaction()
+		actual_qty_2 = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty_2, 35)
 
 		# Check incoming rate for return entry
@@ -286,7 +279,7 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEqual(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
-		stock_in_hand_account = get_inventory_account('_Test Company', dn1.items[0].warehouse)
+		stock_in_hand_account = get_inventory_account(company, dn1.items[0].warehouse)
 
 		# Check gl entry for warehouse
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Delivery Note",
@@ -294,33 +287,33 @@
 
 		self.assertEqual(gle_warehouse_amount, stock_value_difference)
 
-		set_perpetual_inventory(0, company)
 
 	def test_return_entire_bundled_items(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		create_stock_reconciliation(item_code="_Test Item",
-			target="_Test Warehouse - _TC", qty=50, rate=100)
+			warehouse="Stores - TCP1", qty=50, rate=100,
+			company=company, expense_account = "Stock Adjustment - TCP1")
 		create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
-			target="_Test Warehouse - _TC", qty=50, rate=100)
+			warehouse="Stores - TCP1", qty=50, rate=100,
+			company=company, expense_account = "Stock Adjustment - TCP1")
 
-		actual_qty = get_qty_after_transaction()
+		actual_qty = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty, 50)
 
 		dn = create_delivery_note(item_code="_Test Product Bundle Item",
-			qty=5, rate=500)
+			qty=5, rate=500, company=company, warehouse="Stores - TCP1", expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
 		# qty after return
-		actual_qty = get_qty_after_transaction()
+		actual_qty = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty, 25)
 
 		#  return bundled item
 		dn1 = create_delivery_note(item_code='_Test Product Bundle Item', is_return=1,
-			return_against=dn.name, qty=-2, rate=500)
+			return_against=dn.name, qty=-2, rate=500, company=company, warehouse="Stores - TCP1", expense_account="Cost of Goods Sold - TCP1", cost_center="Main - TCP1")
 
 		# qty after return
-		actual_qty = get_qty_after_transaction()
+		actual_qty = get_qty_after_transaction(warehouse="Stores - TCP1")
 		self.assertEqual(actual_qty, 35)
 
 		# Check incoming rate for return entry
@@ -337,8 +330,6 @@
 
 		self.assertEqual(gle_warehouse_amount, 1400)
 
-		set_perpetual_inventory(0, company)
-
 	def test_return_for_serialized_items(self):
 		se = make_serialized_item()
 		serial_no = get_serial_nos(se.get("items")[0].serial_no)[0]
@@ -375,56 +366,44 @@
 		})
 
 	def test_delivery_of_bundled_items_to_target_warehouse(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		set_valuation_method("_Test Item", "FIFO")
 		set_valuation_method("_Test Item Home Desktop 100", "FIFO")
 
-		for warehouse in ("_Test Warehouse - _TC", "_Test Warehouse 1 - _TC"):
-			create_stock_reconciliation(item_code="_Test Item", target=warehouse,
-				qty=100, rate=100)
-			create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
-				target=warehouse, qty=100, rate=100)
+		target_warehouse=get_warehouse(company=company, abbr="TCP1",
+			warehouse_name="_Test Customer Warehouse").name
 
-		opening_qty_test_warehouse_1 = get_qty_after_transaction(warehouse="_Test Warehouse 1 - _TC")
+		for warehouse in ("Stores - TCP1", target_warehouse):
+			create_stock_reconciliation(item_code="_Test Item", warehouse=warehouse, company = company,
+				expense_account = "Stock Adjustment - TCP1", qty=500, rate=100)
+			create_stock_reconciliation(item_code="_Test Item Home Desktop 100", company = company,
+				expense_account = "Stock Adjustment - TCP1", warehouse=warehouse, qty=500, rate=100)
+
 		dn = create_delivery_note(item_code="_Test Product Bundle Item",
-			qty=5, rate=500, target_warehouse="_Test Warehouse 1 - _TC", do_not_submit=True)
+			company='_Test Company with perpetual inventory', cost_center = 'Main - TCP1',
+			expense_account = "Cost of Goods Sold - TCP1", do_not_submit=True, qty=5, rate=500,
+			warehouse="Stores - TCP1", target_warehouse=target_warehouse)
 
 		dn.submit()
 
 		# qty after delivery
-		actual_qty = get_qty_after_transaction(warehouse="_Test Warehouse - _TC")
-		self.assertEqual(actual_qty, 75)
+		actual_qty_at_source = get_qty_after_transaction(warehouse="Stores - TCP1")
+		self.assertEqual(actual_qty_at_source, 475)
 
-		actual_qty = get_qty_after_transaction(warehouse="_Test Warehouse 1 - _TC")
-		self.assertEqual(actual_qty, opening_qty_test_warehouse_1 + 25)
+		actual_qty_at_target = get_qty_after_transaction(warehouse=target_warehouse)
+		self.assertEqual(actual_qty_at_target, 525)
 
-		# stock value diff for source warehouse
-		# for "_Test Item"
+		# stock value diff for source warehouse for "_Test Item"
 		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
 			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
-				"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
+				"item_code": "_Test Item", "warehouse": "Stores - TCP1"},
 			"stock_value_difference")
 
 		# stock value diff for target warehouse
 		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry",
 			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
-				"item_code": "_Test Item", "warehouse": "_Test Warehouse 1 - _TC"},
-			"stock_value_difference")
-
-		self.assertEqual(abs(stock_value_difference), stock_value_difference1)
-
-		# for "_Test Item Home Desktop 100"
-		stock_value_difference = frappe.db.get_value("Stock Ledger Entry",
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
-				"item_code": "_Test Item Home Desktop 100", "warehouse": "_Test Warehouse - _TC"},
-			"stock_value_difference")
-
-		# stock value diff for target warehouse
-		stock_value_difference1 = frappe.db.get_value("Stock Ledger Entry",
-			{"voucher_type": "Delivery Note", "voucher_no": dn.name,
-				"item_code": "_Test Item Home Desktop 100", "warehouse": "_Test Warehouse 1 - _TC"},
+				"item_code": "_Test Item", "warehouse": target_warehouse},
 			"stock_value_difference")
 
 		self.assertEqual(abs(stock_value_difference), stock_value_difference1)
@@ -435,21 +414,20 @@
 
 		stock_value_difference = abs(frappe.db.sql("""select sum(stock_value_difference)
 			from `tabStock Ledger Entry` where voucher_type='Delivery Note' and voucher_no=%s
-			and warehouse='_Test Warehouse - _TC'""", dn.name)[0][0])
+			and warehouse='Stores - TCP1'""", dn.name)[0][0])
 
 		expected_values = {
-			"Stock In Hand - _TC": [0.0, stock_value_difference],
-			"_Test Warehouse 1 - _TC": [stock_value_difference, 0.0]
+			"Stock In Hand - TCP1": [0.0, stock_value_difference],
+			target_warehouse: [stock_value_difference, 0.0]
 		}
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
 
-		set_perpetual_inventory(0, company)
-
 	def test_closed_delivery_note(self):
 		from erpnext.stock.doctype.delivery_note.delivery_note import update_delivery_note_status
 
-		dn = create_delivery_note(do_not_submit=True)
+		dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1", do_not_submit=True)
+
 		dn.submit()
 
 		update_delivery_note_status(dn.name, "Closed")
@@ -574,24 +552,23 @@
 		accounts_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
 		accounts_settings.allow_cost_center_in_entry_of_bs_account = 1
 		accounts_settings.save()
-		cost_center = "_Test Cost Center for BS Account - _TC"
-		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company")
+		cost_center = "_Test Cost Center for BS Account - TCP1"
+		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company with perpetual inventory")
 
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		set_valuation_method("_Test Item", "FIFO")
 
-		make_stock_entry(target="_Test Warehouse - _TC", qty=5, basic_rate=100)
+		make_stock_entry(target="Stores - TCP1", qty=5, basic_rate=100)
 
-		stock_in_hand_account = get_inventory_account('_Test Company')
-		dn = create_delivery_note(cost_center=cost_center)
+		stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
+		dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1',  expense_account = "Cost of Goods Sold - TCP1", cost_center=cost_center)
 
 		gl_entries = get_gl_entries("Delivery Note", dn.name)
 		self.assertTrue(gl_entries)
 
 		expected_values = {
-			"Cost of Goods Sold - _TC": {
+			"Cost of Goods Sold - TCP1": {
 				"cost_center": cost_center
 			},
 			stock_in_hand_account: {
@@ -600,8 +577,6 @@
 		}
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
-
-		set_perpetual_inventory(0, company)
 		accounts_settings.allow_cost_center_in_entry_of_bs_account = 0
 		accounts_settings.save()
 
@@ -609,23 +584,22 @@
 		accounts_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
 		accounts_settings.allow_cost_center_in_entry_of_bs_account = 0
 		accounts_settings.save()
-		cost_center = "_Test Cost Center - _TC"
+		cost_center = "Main - TCP1"
 
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		set_valuation_method("_Test Item", "FIFO")
 
-		make_stock_entry(target="_Test Warehouse - _TC", qty=5, basic_rate=100)
+		make_stock_entry(target="Stores - TCP1", qty=5, basic_rate=100)
 
-		stock_in_hand_account = get_inventory_account('_Test Company')
-		dn = create_delivery_note()
+		stock_in_hand_account = get_inventory_account('_Test Company with perpetual inventory')
+		dn = create_delivery_note(company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', cost_center = 'Main - TCP1', expense_account = "Cost of Goods Sold - TCP1")
 
 		gl_entries = get_gl_entries("Delivery Note", dn.name)
 
 		self.assertTrue(gl_entries)
 		expected_values = {
-			"Cost of Goods Sold - _TC": {
+			"Cost of Goods Sold - TCP1": {
 				"cost_center": cost_center
 			},
 			stock_in_hand_account: {
@@ -635,8 +609,6 @@
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
-		set_perpetual_inventory(0, company)
-
 	def test_make_sales_invoice_from_dn_for_returned_qty(self):
 		from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
@@ -702,7 +674,7 @@
 		"rate": args.rate or 100,
 		"conversion_factor": 1.0,
 		"allow_zero_valuation_rate": args.allow_zero_valuation_rate or 1,
-		"expense_account": "Cost of Goods Sold - _TC",
+		"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
 		"cost_center": args.cost_center or "_Test Cost Center - _TC",
 		"serial_no": args.serial_no,
 		"target_warehouse": args.target_warehouse
diff --git a/erpnext/stock/doctype/item_alternative/test_item_alternative.py b/erpnext/stock/doctype/item_alternative/test_item_alternative.py
index d5700fe..f045e4f 100644
--- a/erpnext/stock/doctype/item_alternative/test_item_alternative.py
+++ b/erpnext/stock/doctype/item_alternative/test_item_alternative.py
@@ -12,9 +12,11 @@
 from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
 from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt, make_rm_stock_entry
 import unittest
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 
 class TestItemAlternative(unittest.TestCase):
 	def setUp(self):
+		set_perpetual_inventory(0)
 		make_items()
 
 	def test_alternative_item_for_subcontract_rm(self):
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index d001a91..3f37093 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -129,7 +129,7 @@
 
 			# update stock & gl entries for submit state of PR
 			doc.docstatus = 1
-			doc.update_stock_ledger(via_landed_cost_voucher=True)
+			doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
 			doc.make_gl_entries()
 
 	def update_rate_in_serial_no(self, receipt_document):
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index c32f028..4dc0b7b 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -14,15 +14,15 @@
 class TestLandedCostVoucher(unittest.TestCase):
 	def test_landed_cost_voucher(self):
 		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
-		set_perpetual_inventory(1)
-		pr = frappe.copy_doc(pr_test_records[0])
-		pr.submit()
+
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", get_multiple_items = True, get_taxes_and_charges = True)
+
 
 		last_sle = frappe.db.get_value("Stock Ledger Entry", {
 				"voucher_type": pr.doctype,
 				"voucher_no": pr.name,
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC"
+				"warehouse": "Stores - TCP1"
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
@@ -35,7 +35,7 @@
 				"voucher_type": pr.doctype,
 				"voucher_no": pr.name,
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC"
+				"warehouse": "Stores - TCP1"
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
@@ -48,55 +48,56 @@
 		self.assertTrue(gl_entries)
 
 		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
-		fixed_asset_account = get_inventory_account(pr.company, pr.get("items")[1].warehouse)  
+		fixed_asset_account = get_inventory_account(pr.company, pr.get("items")[1].warehouse)
 
 		if stock_in_hand_account == fixed_asset_account:
 			expected_values = {
 				stock_in_hand_account: [800.0, 0.0],
-				"Stock Received But Not Billed - _TC": [0.0, 500.0],
-				"Expenses Included In Valuation - _TC": [0.0, 300.0]
+				"Stock Received But Not Billed - TCP1": [0.0, 500.0],
+				"Expenses Included In Valuation - TCP1": [0.0, 300.0]
 			}
-			
+
 		else:
 			expected_values = {
 				stock_in_hand_account: [400.0, 0.0],
 				fixed_asset_account: [400.0, 0.0],
-				"Stock Received But Not Billed - _TC": [0.0, 500.0],
-				"Expenses Included In Valuation - _TC": [0.0, 300.0]
+				"Stock Received But Not Billed - TCP1": [0.0, 500.0],
+				"Expenses Included In Valuation - TCP1": [0.0, 300.0]
 			}
 
 		for gle in gl_entries:
 			self.assertEqual(expected_values[gle.account][0], gle.debit)
 			self.assertEqual(expected_values[gle.account][1], gle.credit)
 
-		set_perpetual_inventory(0)
-		
+
 	def test_landed_cost_voucher_against_purchase_invoice(self):
-		set_perpetual_inventory(1)
-		
+
 		pi = make_purchase_invoice(update_stock=1, posting_date=frappe.utils.nowdate(),
-			posting_time=frappe.utils.nowtime())
+			posting_time=frappe.utils.nowtime(), cash_bank_account="Cash - TCP1",
+			company="_Test Company with perpetual inventory", supplier_warehouse="Work In Progress - TCP1",
+			warehouse= "Stores - TCP1", cost_center = "Main - TCP1",
+			expense_account ="_Test Account Cost for Goods Sold - TCP1")
 
 		last_sle = frappe.db.get_value("Stock Ledger Entry", {
 				"voucher_type": pi.doctype,
 				"voucher_no": pi.name,
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC"
+				"warehouse": "Stores - TCP1"
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
 		submit_landed_cost_voucher("Purchase Invoice", pi.name)
-		
-		pi_lc_value = frappe.db.get_value("Purchase Invoice Item", {"parent": pi.name}, 
+
+		pi_lc_value = frappe.db.get_value("Purchase Invoice Item", {"parent": pi.name},
 			"landed_cost_voucher_amount")
-			
+
 		self.assertEqual(pi_lc_value, 50.0)
 
 		last_sle_after_landed_cost = frappe.db.get_value("Stock Ledger Entry", {
 				"voucher_type": pi.doctype,
 				"voucher_no": pi.name,
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC"
+				"warehouse": "Stores - TCP1"
 			},
 			fieldname=["qty_after_transaction", "stock_value"], as_dict=1)
 
@@ -111,21 +112,21 @@
 
 		expected_values = {
 			stock_in_hand_account: [300.0, 0.0],
-			"Creditors - _TC": [0.0, 250.0],
-			"Expenses Included In Valuation - _TC": [0.0, 50.0]
+			"Creditors - TCP1": [0.0, 250.0],
+			"Expenses Included In Valuation - TCP1": [0.0, 50.0]
 		}
 
 		for gle in gl_entries:
 			self.assertEqual(expected_values[gle.account][0], gle.debit)
 			self.assertEqual(expected_values[gle.account][1], gle.credit)
 
-		set_perpetual_inventory(0)
-		
-	def test_landed_cost_voucher_for_serialized_item(self):
-		set_perpetual_inventory(1)
-		frappe.db.sql("delete from `tabSerial No` where name in ('SN001', 'SN002', 'SN003', 'SN004', 'SN005')")
 
-		pr = frappe.copy_doc(pr_test_records[0])
+	def test_landed_cost_voucher_for_serialized_item(self):
+		frappe.db.sql("delete from `tabSerial No` where name in ('SN001', 'SN002', 'SN003', 'SN004', 'SN005')")
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1",
+		supplier_warehouse = "Work in Progress - TCP1", get_multiple_items = True,
+		get_taxes_and_charges = True, do_not_submit = True)
+
 		pr.items[0].item_code = "_Test Serialized Item"
 		pr.items[0].serial_no = "SN001\nSN002\nSN003\nSN004\nSN005"
 		pr.submit()
@@ -138,39 +139,36 @@
 			["warehouse", "purchase_rate"], as_dict=1)
 
 		self.assertEqual(serial_no.purchase_rate - serial_no_rate, 5.0)
-		self.assertEqual(serial_no.warehouse, "_Test Warehouse - _TC")
+		self.assertEqual(serial_no.warehouse, "Stores - TCP1")
 
-		set_perpetual_inventory(0)
 
 	def test_landed_cost_voucher_for_odd_numbers (self):
-		set_perpetual_inventory(1)
 
-		pr = make_purchase_receipt(do_not_save=True)
-		pr.items[0].cost_center = "_Test Company - _TC"
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", do_not_save=True)
+		pr.items[0].cost_center = "Main - TCP1"
 		for x in range(2):
 			pr.append("items", {
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC",
-				"cost_center": "_Test Company - _TC",
+				"warehouse": "Stores - TCP1",
+				"cost_center": "Main - TCP1",
 				"qty": 5,
 				"rate": 50
 			})
 		pr.submit()
 
 		lcv = submit_landed_cost_voucher("Purchase Receipt", pr.name, 123.22)
-		
+
 		self.assertEqual(lcv.items[0].applicable_charges, 41.07)
-		self.assertEqual(lcv.items[2].applicable_charges, 41.08)		
-		
-		set_perpetual_inventory(0)
+		self.assertEqual(lcv.items[2].applicable_charges, 41.08)
+
 
 def submit_landed_cost_voucher(receipt_document_type, receipt_document, charges=50):
 	ref_doc = frappe.get_doc(receipt_document_type, receipt_document)
-	
+
 	lcv = frappe.new_doc("Landed Cost Voucher")
 	lcv.company = "_Test Company"
 	lcv.distribute_charges_based_on = 'Amount'
-	
+
 	lcv.set("purchase_receipts", [{
 		"receipt_document_type": receipt_document_type,
 		"receipt_document": receipt_document,
@@ -178,7 +176,7 @@
 		"posting_date": ref_doc.posting_date,
 		"grand_total": ref_doc.base_grand_total
 	}])
-	
+
 	lcv.set("taxes", [{
 		"description": "Insurance Charges",
 		"account": "_Test Account Insurance Charges - _TC",
@@ -186,13 +184,13 @@
 	}])
 
 	lcv.insert()
-	
+
 	distribute_landed_cost_on_items(lcv)
-	
+
 	lcv.submit()
 
 	return lcv
-		
+
 def distribute_landed_cost_on_items(lcv):
 	based_on = lcv.distribute_charges_based_on.lower()
 	total = sum([flt(d.get(based_on)) for d in lcv.get("items")])
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index ab9311b..e9ddf9d 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -14,6 +14,7 @@
 from six import iteritems
 class TestPurchaseReceipt(unittest.TestCase):
 	def setUp(self):
+		set_perpetual_inventory(0)
 		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 
 	def test_make_purchase_invoice(self):
@@ -32,7 +33,6 @@
 
 	def test_purchase_receipt_no_gl_entry(self):
 		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(0, company)
 
 		existing_bin_stock_value = frappe.db.get_value("Bin", {"item_code": "_Test Item",
 			"warehouse": "_Test Warehouse - _TC"}, "stock_value")
@@ -52,33 +52,29 @@
 		self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
 
 	def test_purchase_receipt_gl_entry(self):
-		pr = frappe.copy_doc(test_records[0])
-		set_perpetual_inventory(1, pr.company)
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", get_multiple_items = True, get_taxes_and_charges = True)
 		self.assertEqual(cint(erpnext.is_perpetual_inventory_enabled(pr.company)), 1)
-		pr.insert()
-		pr.submit()
 
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
 		self.assertTrue(gl_entries)
 
-		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
-		fixed_asset_account = get_inventory_account(pr.company, pr.get("items")[1].warehouse)
+		stock_in_hand_account = get_inventory_account(pr.company, pr.items[0].warehouse)
+		fixed_asset_account = get_inventory_account(pr.company, pr.items[1].warehouse)
 
 		if stock_in_hand_account == fixed_asset_account:
 			expected_values = {
 				stock_in_hand_account: [750.0, 0.0],
-				"Stock Received But Not Billed - _TC": [0.0, 500.0],
-				"Expenses Included In Valuation - _TC": [0.0, 250.0]
+				"Stock Received But Not Billed - TCP1": [0.0, 500.0],
+				"Expenses Included In Valuation - TCP1": [0.0, 250.0]
 			}
 		else:
 			expected_values = {
 				stock_in_hand_account: [375.0, 0.0],
 				fixed_asset_account: [375.0, 0.0],
-				"Stock Received But Not Billed - _TC": [0.0, 500.0],
-				"Expenses Included In Valuation - _TC": [0.0, 250.0]
+				"Stock Received But Not Billed - TCP1": [0.0, 500.0],
+				"Expenses Included In Valuation - TCP1": [0.0, 250.0]
 			}
-
 		for gle in gl_entries:
 			self.assertEqual(expected_values[gle.account][0], gle.debit)
 			self.assertEqual(expected_values[gle.account][1], gle.credit)
@@ -86,8 +82,6 @@
 		pr.cancel()
 		self.assertFalse(get_gl_entries("Purchase Receipt", pr.name))
 
-		set_perpetual_inventory(0, pr.company)
-
 	def test_subcontracting(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 
@@ -132,11 +126,10 @@
 				pr.get("items")[0].rejected_warehouse)
 
 	def test_purchase_return(self):
-		set_perpetual_inventory()
 
-		pr = make_purchase_receipt()
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
 
-		return_pr = make_purchase_receipt(is_return=1, return_against=pr.name, qty=-2)
+		return_pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", is_return=1, return_against=pr.name, qty=-2)
 
 		# check sle
 		outgoing_rate = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
@@ -153,28 +146,28 @@
 
 		expected_values = {
 			stock_in_hand_account: [0.0, 100.0],
-			"Stock Received But Not Billed - _TC": [100.0, 0.0],
+			"Stock Received But Not Billed - TCP1": [100.0, 0.0],
 		}
 
 		for gle in gl_entries:
 			self.assertEqual(expected_values[gle.account][0], gle.debit)
 			self.assertEqual(expected_values[gle.account][1], gle.credit)
 
-		set_perpetual_inventory(0)
 
 	def test_purchase_return_for_rejected_qty(self):
-		set_perpetual_inventory()
+		from erpnext.stock.doctype.warehouse.test_warehouse import get_warehouse
 
-		pr = make_purchase_receipt(received_qty=4, qty=2)
+		rejected_warehouse=get_warehouse(company = "_Test Company with perpetual inventory", abbr = " - TCP1", warehouse_name = "_Test Rejected Warehouse").name
+		print(rejected_warehouse)
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", received_qty=4, qty=2, rejected_warehouse=rejected_warehouse)
 
-		return_pr = make_purchase_receipt(is_return=1, return_against=pr.name, received_qty = -4, qty=-2)
+		return_pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1", is_return=1, return_against=pr.name, received_qty = -4, qty=-2, rejected_warehouse=rejected_warehouse)
 
 		actual_qty = frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
 			"voucher_no": return_pr.name, 'warehouse': return_pr.items[0].rejected_warehouse}, "actual_qty")
 
 		self.assertEqual(actual_qty, -2)
 
-		set_perpetual_inventory(0)
 
 	def test_purchase_return_for_serialized_items(self):
 		def _check_serial_no_values(serial_no, field_values):
@@ -337,7 +330,6 @@
 		pr.cancel()
 		serial_nos = frappe.get_all('Serial No', {'asset': asset}, 'name') or []
 		self.assertEquals(len(serial_nos), 0)
-		#frappe.db.sql("delete from `tabLocation")
 		frappe.db.sql("delete from `tabAsset`")
 
 	def test_purchase_receipt_for_enable_allow_cost_center_in_entry_of_bs_account(self):
@@ -345,8 +337,8 @@
 		accounts_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
 		accounts_settings.allow_cost_center_in_entry_of_bs_account = 1
 		accounts_settings.save()
-		cost_center = "_Test Cost Center for BS Account - _TC"
-		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company")
+		cost_center = "_Test Cost Center for BS Account - TCP1"
+		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company with perpetual inventory")
 
 		if not frappe.db.exists('Location', 'Test Location'):
 			frappe.get_doc({
@@ -354,8 +346,7 @@
 				'location_name': 'Test Location'
 			}).insert()
 
-		set_perpetual_inventory(1, "_Test Company")
-		pr = make_purchase_receipt(cost_center=cost_center)
+		pr = make_purchase_receipt(cost_center=cost_center, company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
 
 		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
@@ -363,7 +354,7 @@
 		self.assertTrue(gl_entries)
 
 		expected_values = {
-			"Stock Received But Not Billed - _TC": {
+			"Stock Received But Not Billed - TCP1": {
 				"cost_center": cost_center
 			},
 			stock_in_hand_account: {
@@ -373,7 +364,6 @@
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
-		set_perpetual_inventory(0, pr.company)
 		accounts_settings.allow_cost_center_in_entry_of_bs_account = 0
 		accounts_settings.save()
 
@@ -387,9 +377,7 @@
 				'doctype': 'Location',
 				'location_name': 'Test Location'
 			}).insert()
-
-		set_perpetual_inventory(1, "_Test Company")
-		pr = make_purchase_receipt()
+		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse = "Stores - TCP1", supplier_warehouse = "Work in Progress - TCP1")
 
 		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
@@ -397,7 +385,7 @@
 		self.assertTrue(gl_entries)
 
 		expected_values = {
-			"Stock Received But Not Billed - _TC": {
+			"Stock Received But Not Billed - TCP1": {
 				"cost_center": None
 			},
 			stock_in_hand_account: {
@@ -407,8 +395,6 @@
 		for i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
-		set_perpetual_inventory(0, pr.company)
-
 	def test_make_purchase_invoice_from_pr_for_returned_qty(self):
 		from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order, create_pr_against_po
 
@@ -452,6 +438,78 @@
 		from `tabGL Entry` where voucher_type=%s and voucher_no=%s
 		order by account desc""", (voucher_type, voucher_no), as_dict=1)
 
+def get_taxes(**args):
+
+	args = frappe._dict(args)
+
+	return [{'account_head': '_Test Account Shipping Charges - TCP1',
+			'add_deduct_tax': 'Add',
+			'category': 'Valuation and Total',
+			'charge_type': 'Actual',
+			'cost_center': args.cost_center or 'Main - TCP1',
+			'description': 'Shipping Charges',
+			'doctype': 'Purchase Taxes and Charges',
+			'parentfield': 'taxes',
+			'rate': 100.0,
+			'tax_amount': 100.0},
+		{'account_head': '_Test Account VAT - TCP1',
+			'add_deduct_tax': 'Add',
+			'category': 'Total',
+			'charge_type': 'Actual',
+			'cost_center': args.cost_center or 'Main - TCP1',
+			'description': 'VAT',
+			'doctype': 'Purchase Taxes and Charges',
+			'parentfield': 'taxes',
+			'rate': 120.0,
+			'tax_amount': 120.0},
+		{'account_head': '_Test Account Customs Duty - TCP1',
+			'add_deduct_tax': 'Add',
+			'category': 'Valuation',
+			'charge_type': 'Actual',
+			'cost_center': args.cost_center or 'Main - TCP1',
+			'description': 'Customs Duty',
+			'doctype': 'Purchase Taxes and Charges',
+			'parentfield': 'taxes',
+			'rate': 150.0,
+			'tax_amount': 150.0}]
+
+def get_items(**args):
+	args = frappe._dict(args)
+	return [{
+	"base_amount": 250.0,
+	"conversion_factor": 1.0,
+	"description": "_Test Item",
+	"doctype": "Purchase Receipt Item",
+	"item_code": "_Test Item",
+	"item_name": "_Test Item",
+	"parentfield": "items",
+	"qty": 5.0,
+	"rate": 50.0,
+	"received_qty": 5.0,
+	"rejected_qty": 0.0,
+	"stock_uom": "_Test UOM",
+	"uom": "_Test UOM",
+	"warehouse": args.warehouse or "_Test Warehouse - _TC",
+	"cost_center": args.cost_center or "Main - _TC"
+	},
+	{
+	"base_amount": 250.0,
+	"conversion_factor": 1.0,
+	"description": "_Test Item Home Desktop 100",
+	"doctype": "Purchase Receipt Item",
+	"item_code": "_Test Item Home Desktop 100",
+	"item_name": "_Test Item Home Desktop 100",
+	"parentfield": "items",
+	"qty": 5.0,
+	"rate": 50.0,
+	"received_qty": 5.0,
+	"rejected_qty": 0.0,
+	"stock_uom": "_Test UOM",
+	"uom": "_Test UOM",
+	"warehouse": args.warehouse or "_Test Warehouse 1 - _TC",
+	"cost_center": args.cost_center or "Main - _TC"
+	}]
+
 def make_purchase_receipt(**args):
 	if not frappe.db.exists('Location', 'Test Location'):
 		frappe.get_doc({
@@ -468,7 +526,7 @@
 	pr.company = args.company or "_Test Company"
 	pr.supplier = args.supplier or "_Test Supplier"
 	pr.is_subcontracted = args.is_subcontracted or "No"
-	pr.supplier_warehouse = "_Test Warehouse 1 - _TC"
+	pr.supplier_warehouse = args.supplier_warehouse or "_Test Warehouse 1 - _TC"
 	pr.currency = args.currency or "INR"
 	pr.is_return = args.is_return
 	pr.return_against = args.return_against
@@ -492,6 +550,16 @@
 		"asset_location": args.location or "Test Location"
 	})
 
+	if args.get_multiple_items:
+		pr.items = []
+		for item in get_items(warehouse= args.warehouse, cost_center = args.cost_center or frappe.get_cached_value('Company', pr.company, 'cost_center')):
+			pr.append("items", item)
+
+
+	if args.get_taxes_and_charges:
+		for tax in get_taxes():
+			pr.append("taxes", tax)
+
 	if not args.do_not_save:
 		pr.insert()
 		if not args.do_not_submit:
diff --git a/erpnext/stock/doctype/purchase_receipt/test_records.json b/erpnext/stock/doctype/purchase_receipt/test_records.json
index 7c20991..e7ea9af 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_records.json
+++ b/erpnext/stock/doctype/purchase_receipt/test_records.json
@@ -83,39 +83,5 @@
    }
   ],
   "supplier": "_Test Supplier"
- },
-
-
- {
-  "buying_price_list": "_Test Price List",
-  "company": "_Test Company",
-  "conversion_rate": 1.0,
-  "currency": "INR",
-  "doctype": "Purchase Receipt",
-  "base_grand_total": 5000.0,
-  "is_subcontracted": "Yes",
-  "base_net_total": 5000.0,
-  "posting_date": "2013-02-12",
-  "items": [
-   {
-    "base_amount": 5000.0,
-    "conversion_factor": 1.0,
-    "description": "_Test FG Item",
-    "doctype": "Purchase Receipt Item",
-    "item_code": "_Test FG Item",
-    "item_name": "_Test FG Item",
-    "parentfield": "items",
-    "qty": 10.0,
-    "rate": 500.0,
-    "received_qty": 10.0,
-    "rejected_qty": 0.0,
-    "stock_uom": "_Test UOM",
-    "uom": "_Test UOM",
-    "warehouse": "_Test Warehouse - _TC",
-	"cost_center": "Main - _TC"
-   }
-  ],
-  "supplier": "_Test Supplier",
-  "supplier_warehouse": "_Test Warehouse - _TC"
  }
 ]
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/test_serial_no.py b/erpnext/stock/doctype/serial_no/test_serial_no.py
index ed70790..ab06107 100644
--- a/erpnext/stock/doctype/serial_no/test_serial_no.py
+++ b/erpnext/stock/doctype/serial_no/test_serial_no.py
@@ -12,6 +12,7 @@
 from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 
 test_dependencies = ["Item"]
 test_records = frappe.get_test_records('Serial No')
@@ -37,6 +38,8 @@
 		self.assertTrue(SerialNoCannotCannotChangeError, sr.save)
 
 	def test_inter_company_transfer(self):
+		set_perpetual_inventory(0, "_Test Company 1")
+		set_perpetual_inventory(0)
 		se = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
 		serial_nos = get_serial_nos(se.get("items")[0].serial_no)
 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 758fb37..55e02a4 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -241,7 +241,9 @@
 
 		for d in self.get("items"):
 			if not d.expense_account:
-				frappe.throw(_("Please enter Difference Account"))
+				frappe.throw(_("Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}")
+					.format(frappe.bold(self.company)))
+
 			elif self.is_opening == "Yes" and frappe.db.get_value("Account", d.expense_account, "report_type") == "Profit and Loss":
 				frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"), OpeningEntryAccountError)
 
@@ -329,8 +331,8 @@
 			if total_completed_qty > flt(completed_qty):
 				job_card = frappe.db.get_value('Job Card', {'operation_id': d.name}, 'name')
 				if not job_card:
-					frappe.throw(_("Work Order {0}: job card not found for the operation {1}")
-						.format(self.work_order, job_card))
+					frappe.throw(_("Work Order {0}: Job Card not found for the operation {1}")
+						.format(self.work_order, d.operation))
 
 				work_order_link = frappe.utils.get_link_to_form('Work Order', self.work_order)
 				job_card_link = frappe.utils.get_link_to_form('Job Card', job_card)
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 3fa815d..941472b 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -16,7 +16,6 @@
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.stock.doctype.stock_entry.stock_entry import move_sample_to_retention_warehouse, make_stock_in_entry
 from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import OpeningEntryAccountError
-
 from six import iteritems
 
 def get_sle(**args):
@@ -132,20 +131,19 @@
 		self.assertTrue(item_code in items)
 
 	def test_material_receipt_gl_entry(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
-		mr = make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
-			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
+		mr = make_stock_entry(item_code="_Test Item", target="Stores - TCP1", company= company,
+			qty=50, basic_rate=100, expense_account="Stock Adjustment - TCP1")
 
 		stock_in_hand_account = get_inventory_account(mr.company, mr.get("items")[0].t_warehouse)
 		self.check_stock_ledger_entries("Stock Entry", mr.name,
-			[["_Test Item", "_Test Warehouse - _TC", 50.0]])
+			[["_Test Item", "Stores - TCP1", 50.0]])
 
 		self.check_gl_entries("Stock Entry", mr.name,
 			sorted([
 				[stock_in_hand_account, 5000.0, 0.0],
-				["Stock Adjustment - _TC", 0.0, 5000.0]
+				["Stock Adjustment - TCP1", 0.0, 5000.0]
 			])
 		)
 
@@ -158,29 +156,26 @@
 			where voucher_type='Stock Entry' and voucher_no=%s""", mr.name))
 
 	def test_material_issue_gl_entry(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
+		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", company= company,
+			qty=50, basic_rate=100, expense_account="Stock Adjustment - TCP1")
 
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
-			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
-
-		mi = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC",
-			qty=40, expense_account="Stock Adjustment - _TC")
+		mi = make_stock_entry(item_code="_Test Item", source="Stores - TCP1", company=company,
+			qty=40, expense_account="Stock Adjustment - TCP1")
 
 		self.check_stock_ledger_entries("Stock Entry", mi.name,
-			[["_Test Item", "_Test Warehouse - _TC", -40.0]])
+			[["_Test Item", "Stores - TCP1", -40.0]])
 
-		stock_in_hand_account = get_inventory_account(mi.company, "_Test Warehouse - _TC")
+		stock_in_hand_account = get_inventory_account(mi.company, "Stores - TCP1")
 		stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
 			"voucher_no": mi.name}, "stock_value_difference"))
 
 		self.check_gl_entries("Stock Entry", mi.name,
 			sorted([
 				[stock_in_hand_account, 0.0, stock_value_diff],
-				["Stock Adjustment - _TC", stock_value_diff, 0.0]
+				["Stock Adjustment - TCP1", stock_value_diff, 0.0]
 			])
 		)
-
 		mi.cancel()
 
 		self.assertFalse(frappe.db.sql("""select name from `tabStock Ledger Entry`
@@ -190,16 +185,15 @@
 			where voucher_type='Stock Entry' and voucher_no=%s""", mi.name))
 
 	def test_material_transfer_gl_entry(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
 		create_stock_reconciliation(qty=100, rate=100)
 
-		mtn = make_stock_entry(item_code="_Test Item", source="_Test Warehouse - _TC",
-			target="_Test Warehouse 1 - _TC", qty=45)
+		mtn = make_stock_entry(item_code="_Test Item", source="Stores - TCP1",
+			target="Finished Goods - TCP1", qty=45)
 
 		self.check_stock_ledger_entries("Stock Entry", mtn.name,
-			[["_Test Item", "_Test Warehouse - _TC", -45.0], ["_Test Item", "_Test Warehouse 1 - _TC", 45.0]])
+			[["_Test Item", "Stores - TCP1", -45.0], ["_Test Item", "Finished Goods - TCP1", 45.0]])
 
 		stock_in_hand_account = get_inventory_account(mtn.company, mtn.get("items")[0].s_warehouse)
 
@@ -212,7 +206,7 @@
 
 		else:
 			stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
-				"voucher_no": mtn.name, "warehouse": "_Test Warehouse - _TC"}, "stock_value_difference"))
+				"voucher_no": mtn.name, "warehouse": "Stores - TCP1"}, "stock_value_difference"))
 
 			self.check_gl_entries("Stock Entry", mtn.name,
 				sorted([
@@ -255,14 +249,21 @@
 		set_perpetual_inventory(0, repack.company)
 
 	def test_repack_with_additional_costs(self):
-		company = frappe.db.get_value('Warehouse', '_Test Warehouse - _TC', 'company')
-		set_perpetual_inventory(1, company)
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, basic_rate=100)
-		repack = frappe.copy_doc(test_records[3])
+		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", company= company,
+			qty=50, basic_rate=100, expense_account="Stock Adjustment - TCP1")
+
+
+		repack = make_stock_entry(company = company, purpose="Repack", do_not_save=True)
 		repack.posting_date = nowdate()
 		repack.posting_time = nowtime()
 
+		items = get_multiple_items()
+		repack.items = []
+		for item in items:
+			repack.append("items", item)
+
 		repack.set("additional_costs", [
 			{
 				"description": "Actual Oerating Cost",
@@ -292,13 +293,12 @@
 		self.check_gl_entries("Stock Entry", repack.name,
 			sorted([
 				[stock_in_hand_account, 1200, 0.0],
-				["Expenses Included In Valuation - _TC", 0.0, 1200.0]
+				["Expenses Included In Valuation - TCP1", 0.0, 1200.0]
 			])
 		)
-		set_perpetual_inventory(0, repack.company)
 
 	def check_stock_ledger_entries(self, voucher_type, voucher_no, expected_sle):
-		expected_sle.sort(key=lambda x: x[0])
+		expected_sle.sort(key=lambda x: x[1])
 
 		# check stock ledger entries
 		sle = frappe.db.sql("""select item_code, warehouse, actual_qty
@@ -306,7 +306,7 @@
 			and voucher_no = %s order by item_code, warehouse, actual_qty""",
 			(voucher_type, voucher_no), as_list=1)
 		self.assertTrue(sle)
-		sle.sort(key=lambda x: x[0])
+		sle.sort(key=lambda x: x[1])
 
 		for i, sle in enumerate(sle):
 			self.assertEqual(expected_sle[i][0], sle[0])
@@ -773,14 +773,12 @@
 		self.assertEqual(doc.per_transferred, 100)
 
 	def test_gle_for_opening_stock_entry(self):
-		set_perpetual_inventory(1)
-
-		mr = make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
-			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC", is_opening="Yes", do_not_save=True)
+		mr = make_stock_entry(item_code="_Test Item", target="Stores - TCP1", company="_Test Company with perpetual inventory",qty=50, basic_rate=100, expense_account="Stock Adjustment - TCP1", is_opening="Yes", do_not_save=True)
 
 		self.assertRaises(OpeningEntryAccountError, mr.save)
 
-		mr.items[0].expense_account = "Temporary Opening - _TC"
+		mr.items[0].expense_account = "Temporary Opening - TCP1"
+
 		mr.save()
 		mr.submit()
 
@@ -805,14 +803,42 @@
 
 def get_qty_after_transaction(**args):
 	args = frappe._dict(args)
-
 	last_sle = get_previous_sle({
 		"item_code": args.item_code or "_Test Item",
 		"warehouse": args.warehouse or "_Test Warehouse - _TC",
 		"posting_date": args.posting_date or nowdate(),
 		"posting_time": args.posting_time or nowtime()
 	})
-
 	return flt(last_sle.get("qty_after_transaction"))
 
+def get_multiple_items():
+	return [
+			{
+				"conversion_factor": 1.0,
+				"cost_center": "Main - TCP1",
+				"doctype": "Stock Entry Detail",
+				"expense_account": "Stock Adjustment - TCP1",
+				"basic_rate": 100,
+				"item_code": "_Test Item",
+				"qty": 50.0,
+				"s_warehouse": "Stores - TCP1",
+				"stock_uom": "_Test UOM",
+				"transfer_qty": 50.0,
+				"uom": "_Test UOM"
+			},
+			{
+				"conversion_factor": 1.0,
+				"cost_center": "Main - TCP1",
+				"doctype": "Stock Entry Detail",
+				"expense_account": "Stock Adjustment - TCP1",
+				"basic_rate": 5000,
+				"item_code": "_Test Item Home Desktop 100",
+				"qty": 1,
+				"stock_uom": "_Test UOM",
+				"t_warehouse": "Stores - TCP1",
+				"transfer_qty": 1,
+				"uom": "_Test UOM"
+			}
+		]
+
 test_records = frappe.get_test_records('Stock Entry')
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index cd05929..e6d7e3f 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -7,7 +7,7 @@
 from __future__ import unicode_literals
 import frappe, unittest
 from frappe.utils import flt, nowdate, nowtime
-from erpnext.accounts.utils import get_stock_and_account_difference
+from erpnext.accounts.utils import get_stock_and_account_balance
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
 from erpnext.stock.stock_ledger import get_previous_sle, update_entries_after
 from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import EmptyStockReconciliationItemsError, get_items
@@ -21,7 +21,6 @@
 	def setUpClass(self):
 		create_batch_or_serial_no_items()
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-		insert_existing_sle()
 
 	def test_reco_for_fifo(self):
 		self._test_reco_sle_gle("FIFO")
@@ -30,7 +29,8 @@
 		self._test_reco_sle_gle("Moving Average")
 
 	def _test_reco_sle_gle(self, valuation_method):
-		set_perpetual_inventory()
+		insert_existing_sle(warehouse='Stores - TCP1')
+		company = frappe.db.get_value('Warehouse', 'Stores - TCP1', 'company')
 		# [[qty, valuation_rate, posting_date,
 		#		posting_time, expected_stock_value, bin_qty, bin_valuation]]
 		input_data = [
@@ -46,14 +46,15 @@
 
 			last_sle = get_previous_sle({
 				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC",
+				"warehouse": "Stores - TCP1",
 				"posting_date": d[2],
 				"posting_time": d[3]
 			})
 
 			# submit stock reconciliation
 			stock_reco = create_stock_reconciliation(qty=d[0], rate=d[1],
-				posting_date=d[2], posting_time=d[3])
+				posting_date=d[2], posting_time=d[3], warehouse="Stores - TCP1",
+				company=company, expense_account = "Stock Adjustment - TCP1")
 
 			# check stock value
 			sle = frappe.db.sql("""select * from `tabStock Ledger Entry`
@@ -73,17 +74,18 @@
 				# no gl entries
 				self.assertTrue(frappe.db.get_value("Stock Ledger Entry",
 					{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
-				self.assertFalse(get_stock_and_account_difference(["_Test Account Stock In Hand - _TC"]))
 
-			stock_reco.cancel()
+				acc_bal, stock_bal, wh_list = get_stock_and_account_balance("Stock In Hand - TCP1",
+					stock_reco.posting_date, stock_reco.company)
+				self.assertEqual(acc_bal, stock_bal)
 
-			self.assertFalse(frappe.db.get_value("Stock Ledger Entry",
-				{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
+				stock_reco.cancel()
 
-			self.assertFalse(frappe.db.get_value("GL Entry",
-				{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
+				self.assertFalse(frappe.db.get_value("Stock Ledger Entry",
+					{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
 
-			set_perpetual_inventory(0)
+				self.assertFalse(frappe.db.get_value("GL Entry",
+					{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}))
 
 	def test_get_items(self):
 		create_warehouse("_Test Warehouse Group 1", {"is_group": 1})
@@ -203,17 +205,17 @@
 			stock_doc.cancel()
 
 
-def insert_existing_sle():
+def insert_existing_sle(warehouse):
 	from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 
 	make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item",
-		target="_Test Warehouse - _TC", qty=10, basic_rate=700)
+		target=warehouse, qty=10, basic_rate=700)
 
 	make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item",
-		source="_Test Warehouse - _TC", qty=15)
+		source=warehouse, qty=15)
 
 	make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item",
-		target="_Test Warehouse - _TC", qty=15, basic_rate=1200)
+		target=warehouse, qty=15, basic_rate=1200)
 
 def create_batch_or_serial_no_items():
 	create_warehouse("_Test Warehouse for Stock Reco1",
@@ -244,7 +246,10 @@
 	sr.company = args.company or "_Test Company"
 	sr.expense_account = args.expense_account or \
 		("Stock Adjustment - _TC" if frappe.get_all("Stock Ledger Entry") else "Temporary Opening - _TC")
-	sr.cost_center = args.cost_center or "_Test Cost Center - _TC"
+	sr.cost_center = args.cost_center \
+		or frappe.get_cached_value("Company", sr.company, "cost_center") \
+		or "_Test Cost Center - _TC"
+
 	sr.append("items", {
 		"item_code": args.item_code or "_Test Item",
 		"warehouse": args.warehouse or "_Test Warehouse - _TC",
diff --git a/erpnext/stock/doctype/warehouse/test_records.json b/erpnext/stock/doctype/warehouse/test_records.json
index 014cf3e..e128558 100644
--- a/erpnext/stock/doctype/warehouse/test_records.json
+++ b/erpnext/stock/doctype/warehouse/test_records.json
@@ -1,42 +1,36 @@
 [
  {
   "company": "_Test Company",
-  "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse",
   "is_group": 0
  },
  {
   "company": "_Test Company",
-  "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Scrap Warehouse",
   "is_group": 0
  },
  {
   "company": "_Test Company",
-  "create_account_under": "Fixed Assets - _TC",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse 1",
   "is_group": 0
  },
  {
   "company": "_Test Company",
-  "create_account_under": "Fixed Assets - _TC",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse 2",
   "is_group": 0
  },
  {
   "company": "_Test Company",
-  "create_account_under": "Stock Assets - _TC",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Rejected Warehouse",
   "is_group": 0
  },
  {
   "company": "_Test Company 1",
-  "create_account_under": "Stock Assets - _TC1",
   "doctype": "Warehouse",
   "warehouse_name": "_Test Warehouse 2",
   "is_group": 0
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index dc39e10..121222d 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -101,8 +101,7 @@
 		w.warehouse_name = warehouse_name
 		w.parent_warehouse = "_Test Warehouse Group - _TC"
 		w.company = company
-		make_account_for_warehouse(warehouse_name, w)
-		w.account = warehouse_id
+		w.account = get_warehouse_account(warehouse_name, company)
 		if properties:
 			w.update(properties)
 		w.save()
@@ -110,9 +109,40 @@
 	else:
 		return warehouse_id
 
-def make_account_for_warehouse(warehouse_name, warehouse_obj):
-	if not frappe.db.exists("Account", warehouse_name + " - _TC"):
-		parent_account = frappe.db.get_value('Account',
-			{'company': warehouse_obj.company, 'is_group':1, 'account_type': 'Stock'},'name')
-		account = create_account(account_name=warehouse_name, \
-				account_type="Stock", parent_account= parent_account, company=warehouse_obj.company)
\ No newline at end of file
+def get_warehouse(**args):
+	args = frappe._dict(args)
+	if(frappe.db.exists("Warehouse", args.warehouse_name + " - " + args.abbr)):
+		return frappe.get_doc("Warehouse", args.warehouse_name + " - " + args.abbr)
+	else:
+		w = frappe.get_doc({
+		"company": args.company or "_Test Company",
+		"doctype": "Warehouse",
+		"warehouse_name": args.warehouse_name,
+		"is_group": 0,
+		"account": get_warehouse_account(args.warehouse_name, args.company, args.abbr)
+		})
+		w.insert()
+		return w
+
+def get_warehouse_account(warehouse_name, company, company_abbr=None):
+	if not company_abbr:
+		company_abbr = frappe.get_cached_value("Company", company, 'abbr')
+
+	if not frappe.db.exists("Account", warehouse_name + " - " + company_abbr):
+		return create_account(
+			account_name=warehouse_name,
+			parent_account=get_group_stock_account(company, company_abbr),
+			account_type='Stock',
+			company=company)
+	else:
+		return warehouse_name + " - " + company_abbr
+
+
+def get_group_stock_account(company, company_abbr=None):
+	group_stock_account = frappe.db.get_value("Account",
+		filters={'account_type': 'Stock', 'is_group': 1, 'company': company}, fieldname='name')
+	if not group_stock_account:
+		if not company_abbr:
+			company_abbr = frappe.get_cached_value("Company", company, 'abbr')
+		group_stock_account = "Current Assets - " + company_abbr
+	return group_stock_account
\ No newline at end of file
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
index e539aff..5296211 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.py
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -89,7 +89,7 @@
 		{conditions}"""
 		.format(conditions=conditions), filters, as_dict=1)
 
-	price_list_names = list(set([frappe.db.escape(item.price_list_name) for item in item_results]))
+	price_list_names = list(set([item.price_list_name for item in item_results]))
 
 	buying_price_map = get_price_map(price_list_names, buying=1)
 	selling_price_map = get_price_map(price_list_names, selling=1)
@@ -129,17 +129,15 @@
 
 	rate_key = "Buying Rate" if buying else "Selling Rate"
 	price_list_key = "Buying Price List" if buying else "Selling Price List"
-	price_list_condition = " and buying=1" if buying else " and selling=1"
 
-	pricing_details = frappe.db.sql("""
-		select
-			name,price_list,price_list_rate
-		from
-			`tabItem Price`
-		where
-			name in ({price_list_names}) {price_list_condition}
-		""".format(price_list_names=', '.join(['%s']*len(price_list_names)),
-	price_list_condition=price_list_condition), price_list_names, as_dict=1)
+	filters = {"name": ("in", price_list_names)}
+	if buying:
+		filters["buying"] = 1
+	else:
+		filters["selling"] = 1
+
+	pricing_details = frappe.get_all("Item Price",
+		fields = ["name", "price_list", "price_list_rate"], filters=filters)
 
 	for d in pricing_details:
 		name = d["name"]
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
index c5cf6c4..9a97210 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
@@ -24,7 +24,7 @@
 
 	data = []
 	for item in items:
-		total_outgoing = consumed_item_map.get(item.name, 0) + delivered_item_map.get(item.name,0)
+		total_outgoing = flt(consumed_item_map.get(item.name, 0)) + flt(delivered_item_map.get(item.name,0))
 		avg_daily_outgoing = flt(total_outgoing / diff, float_preceision)
 		reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
 
@@ -55,18 +55,20 @@
 
 
 def get_consumed_items(condition):
-	cn_items = frappe.db.sql("""select se_item.item_code,
-			sum(se_item.transfer_qty) as 'consume_qty'
-		from `tabStock Entry` se, `tabStock Entry Detail` se_item
-		where se.name = se_item.parent and se.docstatus = 1
-		and (ifnull(se_item.t_warehouse, '') = '' or se.purpose = 'Send to Subcontractor') %s
-		group by se_item.item_code""" % (condition), as_dict=1)
+	consumed_items = frappe.db.sql("""
+		select item_code, abs(sum(actual_qty)) as consumed_qty
+		from `tabStock Ledger Entry`
+		where actual_qty < 0
+			and voucher_type not in ('Delivery Note', 'Sales Invoice')
+			%s
+		group by item_code
+	""" % condition, as_dict=1)
 
-	cn_items_map = {}
-	for item in cn_items:
-		cn_items_map.setdefault(item.item_code, item.consume_qty)
+	consumed_items_map = {}
+	for item in consumed_items:
+		consumed_items_map.setdefault(item.item_code, item.consumed_qty)
 
-	return cn_items_map
+	return consumed_items_map
 
 def get_delivered_items(condition):
 	dn_items = frappe.db.sql("""select dn_item.item_code, sum(dn_item.stock_qty) as dn_qty
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index e5ae70c..68b8b50 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -39,6 +39,9 @@
 
 	data = []
 	conversion_factors = {}
+
+	_func = lambda x: x[1]
+
 	for (company, item, warehouse) in sorted(iwb_map):
 		if item_map.get(item):
 			qty_dict = iwb_map[(company, item, warehouse)]
@@ -70,7 +73,9 @@
 					'latest_age': 0
 				}
 				if fifo_queue:
-					fifo_queue = sorted(fifo_queue, key=lambda fifo_data: fifo_data[1])
+					fifo_queue = sorted(filter(_func, fifo_queue), key=_func)
+					if not fifo_queue: continue
+
 					stock_ageing_data['average_age'] = get_average_age(fifo_queue, to_date)
 					stock_ageing_data['earliest_age'] = date_diff(to_date, fifo_queue[0][1])
 					stock_ageing_data['latest_age'] = date_diff(to_date, fifo_queue[-1][1])
diff --git a/erpnext/stock/report/total_stock_summary/total_stock_summary.py b/erpnext/stock/report/total_stock_summary/total_stock_summary.py
index 41e2f86..ed52393 100644
--- a/erpnext/stock/report/total_stock_summary/total_stock_summary.py
+++ b/erpnext/stock/report/total_stock_summary/total_stock_summary.py
@@ -30,7 +30,7 @@
 
 	if filters.get("group_by") == "Warehouse":
 		if filters.get("company"):
-			conditions += " AND warehouse.company = '%s'" % frappe.db.escape(filters.get("company"), percent=False)
+			conditions += " AND warehouse.company = %s" % frappe.db.escape(filters.get("company"), percent=False)
 
 		conditions += " GROUP BY ledger.warehouse, item.item_code"
 		columns += "'' as company, ledger.warehouse"
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index cdf5fed..b748e3f 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -22,7 +22,6 @@
 		return "{0}: {1}".format(_(self.status), self.subject)
 
 	def validate(self):
-		self.flags.ignore_disabled = 1
 		if self.is_new() and self.via_customer_portal:
 			self.flags.create_communication = True
 
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index 4c35dd0..456bc7e 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -20,6 +20,7 @@
 		shopping_cart.bind_change_qty();
 		shopping_cart.bind_change_notes();
 		shopping_cart.bind_dropdown_cart_buttons();
+		shopping_cart.bind_coupon_code();
 	},
 
 	bind_address_select: function() {
@@ -193,6 +194,29 @@
 				}
 			}
 		});
+	},
+
+	bind_coupon_code: function() {
+		$(".bt-coupon").on("click", function() {
+			shopping_cart.apply_coupon_code(this);
+		});
+	},
+
+	apply_coupon_code: function(btn) {
+		return frappe.call({
+			type: "POST",
+			method: "erpnext.shopping_cart.cart.apply_coupon_code",
+			btn: btn,
+			args : {
+				applied_code : $('.txtcoupon').val(),
+				applied_referral_sales_partner: $('.txtreferral_sales_partner').val()
+			},
+			callback: function(r) {
+				if (r && r.message){
+					location.reload();
+				}
+			}
+		});
 	}
 });
 
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index 2c90f8c..fe53f34 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -4,6 +4,16 @@
 	{% set select_address = True %}
 {% endif %}
 
+{% set show_coupon_code = frappe.db.get_single_value('Shopping Cart Settings', 'show_apply_coupon_code_in_website') %}
+{% if show_coupon_code == 1%}
+<div class="mb-3">
+	<div class="row no-gutters">
+		<input type="text" class="txtcoupon form-control mr-3 w-25" placeholder="Enter Coupon Code" name="txtcouponcode"  ></input>
+		<button class="btn btn-primary btn-sm  bt-coupon">{{ _("Apply Coupon Code") }}</button>
+		<input type="hidden" class="txtreferral_sales_partner" placeholder="Enter Sales Partner" name="txtreferral_sales_partner" type="text"></input>
+		</div>
+</div>
+{% endif %}
 <div class="mb-3" data-section="shipping-address">
 	<h6 class="text-uppercase">{{ _("Shipping Address") }}</h6>
 	<div class="row no-gutters" data-fieldname="shipping_address_name">
@@ -94,7 +104,7 @@
 				{
 					label: __('Country'),
 					fieldname: 'country',
-					fieldtype: 'Data',
+					fieldtype: 'Link',
 					reqd: 1
 				},
 			],
diff --git a/erpnext/templates/includes/order/order_taxes.html b/erpnext/templates/includes/order/order_taxes.html
index 1d26700..4a32aa4 100644
--- a/erpnext/templates/includes/order/order_taxes.html
+++ b/erpnext/templates/includes/order/order_taxes.html
@@ -22,6 +22,71 @@
 {% endif %}
 {% endfor %}
 
+{% if doc.doctype == 'Quotation' %}
+{% if doc.coupon_code %}
+<tr>
+	<th class="text-right" colspan="2">
+		{{ _("Discount") }}
+	</th>
+	<th class="text-right tot_quotation_discount">
+        {% set tot_quotation_discount = [] %}
+        {%- for item in doc.items -%}
+        {% if tot_quotation_discount.append((((item.price_list_rate * item.qty)
+            * item.discount_percentage) / 100)) %}{% endif %}
+         {% endfor %}
+         {{ frappe.utils.fmt_money((tot_quotation_discount | sum),currency=doc.currency) }}
+	</th>
+</tr>
+{% endif %}
+{% endif %}
+
+{% if doc.doctype == 'Sales Order' %}
+{% if doc.coupon_code %}
+<tr>
+	<th class="text-right" colspan="2">
+		{{ _("Total Amount") }}
+	</th>
+	<th class="text-right">
+        <span>
+        {% set total_amount = [] %}
+        {%- for item in doc.items -%}
+        {% if total_amount.append((item.price_list_rate * item.qty)) %}{% endif %}
+        {% endfor %}
+        {{ frappe.utils.fmt_money((total_amount | sum),currency=doc.currency) }}
+        </span>
+	</th>
+</tr>
+<tr>
+    <th class="text-right" colspan="2">
+        {{ _("Applied Coupon Code") }}
+    </th>
+    <th class="text-right">
+        <span>
+        {%- for row in frappe.get_all(doctype="Coupon Code",
+        fields=["coupon_code"], filters={ "name":doc.coupon_code}) -%}
+            <span>{{ row.coupon_code }}</span>
+        {% endfor %}
+        </span>
+    </th>
+</tr>
+<tr>
+    <th class="text-right" colspan="2">
+        {{ _("Discount") }}
+    </th>
+    <th class="text-right">
+        <span>
+        {% set tot_SO_discount = [] %}
+        {%- for item in doc.items -%}
+        {% if tot_SO_discount.append((((item.price_list_rate * item.qty)
+            * item.discount_percentage) / 100)) %}{% endif %}
+        {% endfor %}
+        {{ frappe.utils.fmt_money((tot_SO_discount | sum),currency=doc.currency) }}
+        </span>
+    </th>
+</tr>
+{% endif %}
+{% endif %}
+
 <tr>
 	<th class="text-right" colspan="2">
 		{{ _("Grand Total") }}
diff --git a/erpnext/templates/includes/timesheet/timesheet_row.html b/erpnext/templates/includes/timesheet/timesheet_row.html
index e9cfcda..4852f59 100644
--- a/erpnext/templates/includes/timesheet/timesheet_row.html
+++ b/erpnext/templates/includes/timesheet/timesheet_row.html
@@ -1,13 +1,14 @@
-<div class="web-list-item">
-	<a href="/timesheets?name={{ doc.name | urlencode }}" class="no-decoration">
-		<div class="row">
-			<div class="col-xs-3">
-				<span class="indicator {{ "red" if doc.status=="Cancelled" else "green" if doc.status=="Billed" else "blue" if doc.status=="Submitted" else "darkgrey" }}">{{ doc.name }}</span>
-			</div>
-			<div class="col-xs-3"> Billable Hours: {{ doc.total_billable_hours}} </div>
-			<div class="col-xs-2"> {{ _(doc.sales_invoice) }} </div>
-			<div class="col-xs-2"> {{ _(doc.project) }} </div>
-			<div class="col-xs-2"> {{ _(doc.activity_type) }} </div>
+<div class="web-list-item transaction-list-item">
+	<div class="row">
+		<div class="col-xs-3">
+			<span class='indicator {{ "red" if doc.status=="Cancelled" else "green" if doc.status=="Billed" else "blue" if doc.status=="Submitted" else "darkgrey" }} small'>
+				{{ doc.name }}
+			</span>
 		</div>
-	</a>
+		<div class="col-xs-2 small"> {{ doc.total_billable_hours }} </div>
+		<div class="col-xs-2 small"> {{ doc.project or '' }} </div>
+		<div class="col-xs-2 small"> {{ doc.sales_invoice or '' }} </div>
+		<div class="col-xs-2 small"> {{ _(doc.activity_type) }} </div>
+	</div>
+	<!-- <a href="/timesheets?name={{ doc.name | urlencode }}" class="transaction-item-link">Link</a> -->
 </div>
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 88f8d6f..3cb2e8d 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kliëntkontak
 DocType: Shift Type,Enable Auto Attendance,Aktiveer outo-bywoning
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Voer asseblief Warehouse en Date in
 DocType: Lost Reason Detail,Opportunity Lost Reason,Geleentheid Verlore Rede
 DocType: Patient Appointment,Check availability,Gaan beskikbaarheid
 DocType: Retention Bonus,Bonus Payment Date,Bonus Betalingsdatum
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Voltooide werkorders
 DocType: Support Settings,Forum Posts,Forum Posts
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Die taak is aangewys as &#39;n agtergrondtaak. In die geval dat daar probleme met die verwerking van die agtergrond is, sal die stelsel &#39;n opmerking byvoeg oor die fout op hierdie voorraadversoening en dan weer terug na die konsepstadium."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Jammer, die geldigheid van die koeponkode het nie begin nie"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Belasbare Bedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Jy is nie gemagtig om inskrywings by te voeg of op te dateer voor {0}
 DocType: Leave Policy,Leave Policy Details,Verlaat beleidsbesonderhede
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,verbruikbare
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,graad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 DocType: Restaurant Table,No of Seats,Aantal plekke
 DocType: Sales Invoice,Overdue and Discounted,Agterstallig en verdiskonteer
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Bel ontkoppel
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Lyn spasiëring vir hoeveelheid in woorde
 DocType: Vehicle,Additional Details,Bykomende besonderhede
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Geen beskrywing gegee nie
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Haal voorwerpe uit die pakhuis
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Versoek om aankoop.
 DocType: POS Closing Voucher Details,Collected Amount,Versamel bedrag
 DocType: Lab Test,Submitted Date,Datum gestuur
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Leer
 ,Trial Balance (Simple),Proefbalans (eenvoudig)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Aktiveer Uitgestelde Uitgawe
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Toegepaste koeponkode
 DocType: Asset,Next Depreciation Date,Volgende Depresiasie Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktiwiteitskoste per werknemer
 DocType: Accounts Settings,Settings for Accounts,Instellings vir rekeninge
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Werks bestelling
 DocType: Sales Invoice,Total Qty,Totale hoeveelheid
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-pos ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 DocType: Item,Show in Website (Variant),Wys in Webwerf (Variant)
 DocType: Employee,Health Concerns,Gesondheid Kommer
 DocType: Payroll Entry,Select Payroll Period,Kies Payroll Periode
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Belastingverhoudingsrekening
 DocType: Pricing Rule,Sales Partner,Verkoopsvennoot
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Alle verskaffer scorecards.
+DocType: Coupon Code,To be used to get discount,Word gebruik om afslag te kry
 DocType: Buying Settings,Purchase Receipt Required,Aankoop Ontvangs Benodig
 DocType: Sales Invoice,Rail,spoor
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Werklike koste
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Produksieplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Openingsfaktuurskeppingsinstrument
 DocType: Salary Component,Round to the Nearest Integer,Rond tot die naaste heelgetal
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Laat toe dat items wat nie op voorraad is nie, in die mandjie gevoeg word"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Verkope terug
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Stel aantal in Transaksies gebaseer op Serial No Input
 ,Total Stock Summary,Totale voorraadopsomming
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basissuurkoers (Maatskappy Geld)
 ,Qty To Be Billed,Aantal wat gefaktureer moet word
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Afgelope bedrag
+DocType: Coupon Code,Gift Card,Geskenkbewys
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Gereserveerde hoeveelheid vir produksie: hoeveelheid grondstowwe om vervaardigingsitems te maak.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Aflossingsdatum
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Hierdie banktransaksie is reeds volledig versoen
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Skep tydstaat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Rekening {0} is verskeie kere ingevoer
 DocType: Account,Expenses Included In Valuation,Uitgawes Ingesluit in Waardasie
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Koop fakture
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,U kan net hernu indien u lidmaatskap binne 30 dae verstryk
 DocType: Shopping Cart Settings,Show Stock Availability,Toon voorraad beskikbaarheid
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Stel {0} in batekategorie {1} of maatskappy {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Voorbehou Aantal: Hoeveelheid te koop bestel, maar nie afgelewer nie."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Herstel, as die gekose adres geredigeer word na die stoor"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Voorbehou Aantal vir Onderkontrakte: Hoeveelheid grondstowwe om onderverpakte items te maak.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Voorbehou Aantal vir Onderkontrakte: Hoeveelheid grondstowwe om onderverpakte items te maak.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Item Variant {0} bestaan reeds met dieselfde eienskappe
 DocType: Item,Hub Publishing Details,Hub Publishing Details
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Oopmaak&#39;
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Invoer van items en UOM&#39;s
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Lening Bedrag
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Bygevoeg aan besonderhede
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Jammer, koeponkode is uitgeput"
 DocType: Communication Medium,Catch All,Vang almal
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Skedule Kursus
 DocType: Budget,Applicable on Material Request,Van toepassing op materiaal versoek
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ongeldige kenmerk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} moet ingedien word
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-posveldtogte
+DocType: Sales Partner,To Track inbound purchase,Om inkomende aankope op te spoor
 DocType: Buying Settings,Default Supplier Group,Verstekverskaffergroep
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Hoeveelheid moet minder as of gelyk wees aan {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},"Die maksimum bedrag wat in aanmerking kom vir die komponent {0}, oorskry {1}"
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Doen voorraadinskrywing
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel besprekingsgebruiker
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Stel status in
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Kies asseblief voorvoegsel eerste
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Vervaldatum
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Naby jou
 DocType: Student,O-,O-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Onder oorsig
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Kon nie inteken nie
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Bate {0} geskep
+DocType: Coupon Code,Promotional,promosie
 DocType: Special Test Items,Special Test Items,Spesiale toetsitems
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Jy moet &#39;n gebruiker wees met Stelselbestuurder- en Itembestuurderrolle om op Marketplace te registreer.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Sleutelverslae
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Totale toegewysde persentasie vir verkope span moet 100 wees
 DocType: Subscription Plan,Billing Interval Count,Rekeninginterval telling
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Aanstellings en pasiente
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Waarde ontbreek
 DocType: Employee,Department and Grade,Departement en Graad
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Begin en einddatums
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Kontrak Template Vervaardiging Terme
 ,Delivered Items To Be Billed,Aflewerings Items wat gefaktureer moet word
+DocType: Coupon Code,Maximum Use,Maksimum gebruik
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Oop BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Pakhuis kan nie vir reeksnommer verander word nie.
 DocType: Authorization Rule,Average Discount,Gemiddelde afslag
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,Voorraad
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Laai af as Json
 DocType: Item,Sales Details,Verkoopsbesonderhede
+DocType: Coupon Code,Used,gebruik
 DocType: Opportunity,With Items,Met Items
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Die veldtog &#39;{0}&#39; bestaan reeds vir die {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Onderhoudspan
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",Geen aktiewe BOM gevind vir item {0} nie. Aflewering met \ Serienommer kan nie verseker word nie
 DocType: Sales Partner,Sales Partner Target,Verkoopsvennoteiken
 DocType: Loan Type,Maximum Loan Amount,Maksimum leningsbedrag
-DocType: Pricing Rule,Pricing Rule,Prysreël
+DocType: Coupon Code,Pricing Rule,Prysreël
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplikaatrolnommer vir student {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materiaal Versoek om aankoop bestelling
 DocType: Company,Default Selling Terms,Standaard verkoopvoorwaardes
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,Betalingsbedrag
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Halfdag Datum moet tussen werk van datum en werk einddatum wees
 DocType: Healthcare Settings,Healthcare Service Items,Gesondheidsorg Diens Items
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Ongeldige strepieskode. Daar is geen item verbonde aan hierdie strepieskode nie.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Verbruik Bedrag
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Netto verandering in kontant
 DocType: Assessment Plan,Grading Scale,Graderingskaal
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Bate rekening
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nuwe vrystellingdatum sal in die toekoms wees
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van huidige faktuur se tydperk
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir mensehulpbronne&gt; HR-instellings
 DocType: Lab Test,Technician Name,Tegnikus Naam
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3002,6 +3016,7 @@
 DocType: Products Settings,Hide Variants,Versteek variante
 DocType: Lead,Next Contact By,Volgende kontak deur
 DocType: Compensatory Leave Request,Compensatory Leave Request,Vergoedingsverlofversoek
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Kan nie meer as {2} oor item {0} in ry {1} oorkoop nie. Om oorfakturering toe te laat, stel asseblief toelae in rekeninginstellings"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Hoeveelheid benodig vir item {0} in ry {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Pakhuis {0} kan nie uitgevee word nie, aangesien die hoeveelheid vir item {1} bestaan"
 DocType: Blanket Order,Order Type,Bestelling Tipe
@@ -3171,7 +3186,6 @@
 DocType: Student,Student Mobile Number,Student Mobiele Nommer
 DocType: Item,Has Variants,Het Varianten
 DocType: Employee Benefit Claim,Claim Benefit For,Eisvoordeel vir
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan nie oorbetaal vir Item {0} in ry {1} meer as {2}. Om oor-faktuur toe te laat, stel asseblief in Voorraadinstellings"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Update Response
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},Jy het reeds items gekies van {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van die Maandelikse Verspreiding
@@ -3461,6 +3475,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Spesifiseer asseblief geldeenheid in die Maatskappy
 DocType: Workstation,Wages per hour,Lone per uur
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Stel {0} op
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Voorraadbalans in Batch {0} word negatief {1} vir Item {2} by Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Volgende Materiële Versoeke is outomaties opgestel op grond van die item se herbestellingsvlak
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
@@ -3790,6 +3805,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Dien Salarisstrokie in
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,On Hold
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,&#39;N Kwessie moet ten minste een korrekte opsie hê
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Koop bestellings
 DocType: Account,Inter Company Account,Intermaatskappyrekening
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Invoer in grootmaat
 DocType: Sales Partner,Address & Contacts,Adres &amp; Kontakte
@@ -3800,6 +3816,7 @@
 DocType: POS Profile,[Select],[Kies]
 DocType: Staffing Plan Detail,Number Of Positions,Aantal posisies
 DocType: Vital Signs,Blood Pressure (diastolic),Bloeddruk (diastoliese)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Kies die kliënt.
 DocType: SMS Log,Sent To,Gestuur na
 DocType: Agriculture Task,Holiday Management,Vakansiebestuur
 DocType: Payment Request,Make Sales Invoice,Maak verkoopfaktuur
@@ -4009,7 +4026,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} is nie ingedien nie
 DocType: Subscription,Trialling,uitte
 DocType: Sales Invoice Item,Deferred Revenue,Uitgestelde Inkomste
-DocType: Bank Account,GL Account,GL-rekening
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Kontantrekening sal gebruik word vir die skep van verkope faktuur
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Vrystelling Subkategorie
 DocType: Member,Membership Expiry Date,Lidmaatskap Vervaldatum
@@ -4413,13 +4429,13 @@
 DocType: C-Form Invoice Detail,Territory,gebied
 DocType: Pricing Rule,Apply Rule On Item Code,Pas Reël op Itemkode toe
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Noem asseblief geen besoeke benodig nie
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Voorraadbalansverslag
 DocType: Stock Settings,Default Valuation Method,Verstekwaardasiemetode
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,fooi
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Toon kumulatiewe bedrag
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Werk aan die gang. Dit kan &#39;n rukkie neem.
 DocType: Production Plan Item,Produced Qty,Geproduceerde hoeveelheid
 DocType: Vehicle Log,Fuel Qty,Brandstof Aantal
-DocType: Stock Entry,Target Warehouse Name,Teiken pakhuis naam
 DocType: Work Order Operation,Planned Start Time,Beplande aanvangstyd
 DocType: Course,Assessment,assessering
 DocType: Payment Entry Reference,Allocated,toegeken
@@ -4485,10 +4501,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standaard bepalings en voorwaardes wat by verkope en aankope gevoeg kan word. Voorbeelde: 1. Geldigheid van die aanbod. 1. Betalingsvoorwaardes (Vooraf, Op Krediet, Voorskotte, ens.). 1. Wat is ekstra (of betaalbaar deur die kliënt). 1. Veiligheid / gebruik waarskuwing. 1. Waarborg indien enige. 1. Retourbeleid. 1. Voorwaardes van verskeping, indien van toepassing. 1. Maniere om geskille, skadeloosstelling, aanspreeklikheid, ens. Aan te spreek. 1. Adres en kontak van u maatskappy."
 DocType: Homepage Section,Section Based On,Afdeling gebaseer op
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Toon Pas koeponkode toe
 DocType: Issue,Issue Type,Uitgawe Tipe
 DocType: Attendance,Leave Type,Verlaat tipe
 DocType: Purchase Invoice,Supplier Invoice Details,Verskaffer se faktuurbesonderhede
 DocType: Agriculture Task,Ignore holidays,Ignoreer vakansiedae
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Voeg / wysig koeponvoorwaardes
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Uitgawe / Verskil rekening ({0}) moet &#39;n &#39;Wins of Verlies&#39; rekening wees
 DocType: Stock Entry Detail,Stock Entry Child,Voorraadinskrywingskind
 DocType: Project,Copied From,Gekopieer vanaf
@@ -4663,6 +4681,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assesseringsplan Kriteria
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,transaksies
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Voorkom Aankooporders
+DocType: Coupon Code,Coupon Name,Koeponnaam
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,vatbaar
 DocType: Email Campaign,Scheduled,geskeduleer
 DocType: Shift Type,Working Hours Calculation Based On,Berekening van werksure gebaseer op
@@ -4679,7 +4698,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Skep variante
 DocType: Vehicle,Diesel,diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Pryslys Geldeenheid nie gekies nie
+DocType: Quick Stock Balance,Available Quantity,Beskikbare hoeveelheid
 DocType: Purchase Invoice,Availed ITC Cess,Benut ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel asb. Die opvoeder-benamingstelsel op in onderwys&gt; Onderwysinstellings
 ,Student Monthly Attendance Sheet,Student Maandelikse Bywoningsblad
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Stuurreël is slegs van toepassing op Verkoop
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Waardevermindering-ry {0}: Volgende waarderingsdatum kan nie voor die aankoopdatum wees nie
@@ -4746,8 +4767,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ry {0}: Voorskot teen kliënt moet krediet wees
 DocType: Quality Meeting,Quality Meeting,Kwaliteit vergadering
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Nie-Groep tot Groep
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext gebruiker
+DocType: Coupon Code,Coupon Description,Koeponbeskrywing
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Joernaal is verpligtend in ry {0}
 DocType: Company,Default Buying Terms,Standaard koopvoorwaardes
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Aankoopontvangste Item verskaf
@@ -4910,6 +4931,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Teen dokumentbesonderhede No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Skrapping is nie toegelaat vir land {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Party Tipe is verpligtend
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Pas koeponkode toe
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Vir werkskaart {0} kan u slegs die &#39;Materiaaloordrag vir Vervaardiging&#39; tipe inskrywing doen
 DocType: Quality Inspection,Outgoing,uitgaande
 DocType: Customer Feedback Table,Customer Feedback Table,Kliënteterugvoer-tabel
@@ -5059,7 +5081,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,By die indiening van bestellings
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Voeg alle verskaffers by
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ry # {0}: Toegewysde bedrag kan nie groter wees as die uitstaande bedrag nie.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Klantegroep&gt; Gebied
 DocType: Tally Migration,Parties,partye
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Blaai deur BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Beveiligde Lenings
@@ -5091,7 +5112,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Moenie toelaat dat alternatiewe item vir die item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum word herhaal
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Gemagtigde ondertekenaar
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel asb. Die opvoeder-benamingstelsel op in onderwys&gt; Onderwysinstellings
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Netto ITC beskikbaar (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Skep Fooie
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale Aankoopprys (via Aankoopfaktuur)
@@ -5116,6 +5136,7 @@
 DocType: Quiz Result,Wrong,Verkeerde
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Koers waarteen Pryslys-geldeenheid omgeskakel word na die kliënt se basiese geldeenheid
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Netto Bedrag (Maatskappy Geld)
+DocType: Sales Partner,Referral Code,Verwysingskode
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Totale voorskotbedrag kan nie groter wees as die totale sanksiebedrag nie
 DocType: Salary Slip,Hour Rate,Uurtarief
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Aktiveer outomatiese herbestelling
@@ -5244,6 +5265,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Toon Voorraad Hoeveelheid
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Netto kontant uit bedrywighede
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Ry # {0}: Status moet {1} wees vir faktuurafslag {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {1}) nie gevind vir item: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Item 4
 DocType: Student Admission,Admission End Date,Toelating Einddatum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Sub-kontraktering
@@ -5266,6 +5288,7 @@
 DocType: Travel Request,Fully Sponsored,Volledig Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Skep werkkaart
+DocType: Quotation,Referral Sales Partner,Verwysingsvennoot
 DocType: Quality Procedure Process,Process Description,Prosesbeskrywing
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Kliënt {0} is geskep.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Tans is geen voorraad beskikbaar in enige pakhuis nie
@@ -5400,6 +5423,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM-koers
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Lees opgelaaide lêer
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Gestopte werkbestelling kan nie gekanselleer word nie. Staak dit eers om te kanselleer
+DocType: Coupon Code,Coupon Code,Koeponkode
 DocType: Asset,Journal Entry for Scrap,Tydskrifinskrywing vir afval
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Trek asseblief items van afleweringsnotas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Ry {0}: kies die werkstasie teen die operasie {1}
@@ -5482,6 +5506,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Datum&#39; is verpligtend
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Verwysingsdatum kan nie na {0} wees nie.
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Data Invoer en Uitvoer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Jammer, die geldigheid van die koepon het verval"
 DocType: Bank Account,Account Details,Rekeningbesonderhede
 DocType: Crop,Materials Required,Materiaal benodig
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Geen studente gevind
@@ -5519,6 +5544,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Gaan na gebruikers
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Betaalde bedrag + Skryf af Die bedrag kan nie groter as Grand Total wees nie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} is nie &#39;n geldige lotnommer vir item {1} nie
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Voer asseblief &#39;n geldige koeponkode in !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Nota: Daar is nie genoeg verlofbalans vir Verlof-tipe {0}
 DocType: Task,Task Description,Taakbeskrywing
 DocType: Training Event,Seminar,seminaar
@@ -5782,6 +5808,7 @@
 ,TDS Payable Monthly,TDS betaalbaar maandeliks
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Wag vir die vervanging van die BOM. Dit kan &#39;n paar minute neem.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan nie aftrek wanneer die kategorie vir &#39;Waardasie&#39; of &#39;Waardasie en Totaal&#39; is nie.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir menslike hulpbronne&gt; HR-instellings
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Totale betalings
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial Nos Required for Serialized Item {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Pas betalings met fakture
@@ -5871,6 +5898,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Kry grondstowwe vir produksie
 DocType: Job Opening,Job Title,Werkstitel
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Toekomstige betaling ref
+DocType: Quotation,Additional Discount and Coupon Code,Bykomende afslag- en koeponkode
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} dui aan dat {1} nie &#39;n kwotasie sal verskaf nie, maar al die items \ is aangehaal. Opdateer die RFQ kwotasie status."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maksimum steekproewe - {0} is reeds behou vir bondel {1} en item {2} in bondel {3}.
@@ -6098,7 +6126,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Instellings vir webwerf tuisblad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} is aan die houer tot {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;s word nie toegelaat vir {0} as gevolg van &#39;n telkaart wat staan van {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Maak aankoopfaktuur
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Gebruikte Blare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Gebruikte koepon is {1}. Toegestane hoeveelheid is uitgeput
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Wil u die materiaalversoek indien?
 DocType: Job Offer,Awaiting Response,In afwagting van antwoord
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6112,6 +6142,7 @@
 DocType: Training Event Employee,Optional,opsioneel
 DocType: Salary Slip,Earning & Deduction,Verdien en aftrekking
 DocType: Agriculture Analysis Criteria,Water Analysis,Wateranalise
+DocType: Sales Order,Skip Delivery Note,Slaan afleweringsnota oor
 DocType: Price List,Price Not UOM Dependent,Prys nie UOM afhanklik nie
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} variante geskep.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Daar is reeds &#39;n standaarddiensooreenkoms.
@@ -6216,6 +6247,7 @@
 DocType: Vehicle,Last Carbon Check,Laaste Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Regskoste
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Kies asseblief die hoeveelheid op ry
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Werksbestelling {0}: werkkaart word nie vir die operasie gevind nie {1}
 DocType: Purchase Invoice,Posting Time,Posietyd
 DocType: Timesheet,% Amount Billed,% Bedrag gefaktureer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefoon uitgawes
@@ -6318,7 +6350,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Belasting en heffings bygevoeg
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Waardevermindering-ry {0}: Volgende waarderingsdatum kan nie voor die datum beskikbaar wees vir gebruik nie
 ,Sales Funnel,Verkope trechter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Afkorting is verpligtend
 DocType: Project,Task Progress,Taak vordering
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,wa
@@ -6413,6 +6444,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS-profiel wat nodig is om POS-inskrywing te maak
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Loyaliteitspunte sal bereken word uit die bestede gedoen (via die Verkoopfaktuur), gebaseer op die genoemde invorderingsfaktor."
 DocType: Program Enrollment Tool,Enroll Students,Teken studente in
+DocType: Pricing Rule,Coupon Code Based,Gebaseerde koeponkode
 DocType: Company,HRA Settings,HRA-instellings
 DocType: Homepage,Hero Section,Heldeseksie
 DocType: Employee Transfer,Transfer Date,Oordragdatum
@@ -6528,6 +6560,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Stel asseblief die Maatskappyfilter leeg as Groep By &#39;Maatskappy&#39; is.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posdatum kan nie toekomstige datum wees nie
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Ry # {0}: reeksnommer {1} stem nie ooreen met {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; Numbering Series
 DocType: Stock Entry,Target Warehouse Address,Teiken pakhuis adres
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Toevallige verlof
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Die tyd voor die aanvangstyd van die skof waartydens werknemers-inklok in aanmerking kom vir die bywoning.
@@ -6562,7 +6595,6 @@
 DocType: Employee Grade,Employee Grade,Werknemersgraad
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,stukwerk
 DocType: GSTR 3B Report,June,Junie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 DocType: Share Balance,From No,Van No
 DocType: Shift Type,Early Exit Grace Period,Genade tydperk vir vroeë uitgang
 DocType: Task,Actual Time (in Hours),Werklike tyd (in ure)
@@ -6845,7 +6877,6 @@
 DocType: Warehouse,Warehouse Name,Pakhuisnaam
 DocType: Naming Series,Select Transaction,Kies transaksie
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Voer asseblief &#39;n goedgekeurde rol of goedgekeurde gebruiker in
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {1}) nie vir item gevind nie: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Diensvlakooreenkoms met entiteitstipe {0} en entiteit {1} bestaan reeds.
 DocType: Journal Entry,Write Off Entry,Skryf Uit Inskrywing
 DocType: BOM,Rate Of Materials Based On,Mate van materiaal gebaseer op
@@ -6983,6 +7014,7 @@
 DocType: Budget,Warn,waarsku
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Alle items is reeds vir hierdie werkorder oorgedra.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Enige ander opmerkings, noemenswaardige poging wat in die rekords moet plaasvind."
+DocType: Bank Account,Company Account,Maatskappyrekening
 DocType: Asset Maintenance,Manufacturing User,Vervaardigingsgebruiker
 DocType: Purchase Invoice,Raw Materials Supplied,Grondstowwe voorsien
 DocType: Subscription Plan,Payment Plan,Betalingsplan
@@ -7024,6 +7056,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan nie groter wees as die beplande hoeveelheid ({2}) in werkorder {3}
 DocType: Certification Application,Name of Applicant,Naam van applikant
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Tydskrif vir vervaardiging.
+DocType: Quick Stock Balance,Quick Stock Balance,Vinnige voorraadbalans
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Subtotaal
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan nie Variant eiendomme verander na voorraad transaksie. Jy sal &#39;n nuwe item moet maak om dit te doen.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA Mandaat
@@ -7350,6 +7383,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Stel asseblief {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} is onaktiewe student
 DocType: Employee,Health Details,Gesondheids besonderhede
+DocType: Coupon Code,Coupon Type,Soort koepon
 DocType: Leave Encashment,Encashable days,Ontvankbare dae
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,"Om &#39;n Betalingsversoek te maak, is verwysingsdokument nodig"
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7632,6 +7666,7 @@
 DocType: Hotel Room Package,Amenities,geriewe
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Haal betalingsvoorwaardes outomaties aan
 DocType: QuickBooks Migrator,Undeposited Funds Account,Onvoorsiene Fondsrekening
+DocType: Coupon Code,Uses,gebruike
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Veelvuldige verstekmodus van betaling is nie toegelaat nie
 DocType: Sales Invoice,Loyalty Points Redemption,Lojaliteit punte Redemption
 ,Appointment Analytics,Aanstelling Analytics
@@ -7648,6 +7683,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Totale begroting
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Los leeg as jy studente groepe per jaar maak
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Indien gekontroleer, Totale nommer. van werksdae sal vakansiedae insluit, en dit sal die waarde van salaris per dag verminder"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Kon nie domein byvoeg nie
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Om die ontvangs / aflewering toe te laat, moet u &quot;Toelaag vir oorontvangs / aflewering&quot; in Voorraadinstellings of die item opdateer."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Programme wat die huidige sleutel gebruik, sal nie toegang hê nie, is jy seker?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7660,6 +7696,7 @@
 ,BOM Stock Report,BOM Voorraad Verslag
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","As daar geen toegewysde tydgleuf is nie, word kommunikasie deur hierdie groep hanteer"
 DocType: Stock Reconciliation Item,Quantity Difference,Hoeveelheidsverskil
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 DocType: Opportunity Item,Basic Rate,Basiese tarief
 DocType: GL Entry,Credit Amount,Kredietbedrag
 ,Electronic Invoice Register,Elektroniese faktuurregister
@@ -7913,6 +7950,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Belasting en heffings afgetrek (Maatskappy Geld)
 DocType: Item Group,General Settings,Algemene instellings
 DocType: Article,Article,Artikel
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Voer asseblief koeponkode in !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Van Geld en Geld kan nie dieselfde wees nie
 DocType: Taxable Salary Slab,Percent Deduction,Persent aftrekking
 DocType: GL Entry,To Rename,Om te hernoem
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 8277608..1d07f51 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,ማት-ዱብ-ያዮያን.-
 DocType: Purchase Order,Customer Contact,የደንበኛ ያግኙን
 DocType: Shift Type,Enable Auto Attendance,በራስ መገኘትን ያንቁ።
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,እባክዎ ወደ መጋዘን እና ቀን ያስገቡ
 DocType: Lost Reason Detail,Opportunity Lost Reason,ዕድል የጠፋበት ምክንያት።
 DocType: Patient Appointment,Check availability,ተገኝነትን ያረጋግጡ
 DocType: Retention Bonus,Bonus Payment Date,የጉርሻ ክፍያ ቀን
@@ -265,6 +266,7 @@
 ,Completed Work Orders,የስራ ትዕዛዞችን አጠናቅቋል
 DocType: Support Settings,Forum Posts,ፎረም ልጥፎች
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",ተግባሩ እንደ ዳራ ሥራ ተሸልሟል ፡፡ በጀርባ ሂደት ላይ ማናቸውም ችግር ቢኖር ስርዓቱ በዚህ የአክሲዮን ማቋቋሚያ ዕርቅ ላይ ስሕተት ይጨምርና ወደ ረቂቁ ደረጃ ይመለሳል ፡፡
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",ይቅርታ ፣ የኩፖን ኮድ ትክክለኛነት አልተጀመረም
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,ግብር የሚከፈልበት መጠን
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: Leave Policy,Leave Policy Details,የፖሊሲ ዝርዝሮችን ይተው
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,ደረጃ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም
 DocType: Restaurant Table,No of Seats,የመቀመጫዎች ቁጥር
 DocType: Sales Invoice,Overdue and Discounted,ጊዜው ያለፈበት እና የተቀነሰ።
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,ጥሪ ተቋር .ል።
@@ -505,6 +508,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ቃላት ውስጥ መጠን ለማግኘት የመስመር ክፍተት
 DocType: Vehicle,Additional Details,ተጨማሪ ዝርዝሮች
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,የተሰጠው መግለጫ የለም
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,ከመጋዘን ቤት ዕቃዎች
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,ግዢ ይጠይቁ.
 DocType: POS Closing Voucher Details,Collected Amount,የተከማቹ መጠን
 DocType: Lab Test,Submitted Date,የተረከበት ቀን
@@ -612,6 +616,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,ይወቁ
 ,Trial Balance (Simple),የሙከራ ሂሳብ (ቀላል)
 DocType: Purchase Invoice Item,Enable Deferred Expense,የሚገመተው ወጪን ያንቁ
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,የተተገበረ የኩፖን ኮድ
 DocType: Asset,Next Depreciation Date,ቀጣይ የእርጅና ቀን
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,የተቀጣሪ በአንድ እንቅስቃሴ ወጪ
 DocType: Accounts Settings,Settings for Accounts,መለያዎች ቅንብሮች
@@ -846,8 +851,6 @@
 DocType: BOM,Work Order,የሥራ ትዕዛዝ
 DocType: Sales Invoice,Total Qty,ጠቅላላ ብዛት
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ኢሜይል መታወቂያ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ።"
 DocType: Item,Show in Website (Variant),የድር ጣቢያ ውስጥ አሳይ (ተለዋጭ)
 DocType: Employee,Health Concerns,የጤና ሰጋት
 DocType: Payroll Entry,Select Payroll Period,የደመወዝ ክፍያ ክፍለ ይምረጡ
@@ -1011,6 +1014,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,የግብር መያዣ ሂሳብ
 DocType: Pricing Rule,Sales Partner,የሽያጭ አጋር
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,ሁሉም የአቅራቢ መለኪያ ካርዶች.
+DocType: Coupon Code,To be used to get discount,ቅናሽ ለማግኘት ጥቅም ላይ እንዲውል
 DocType: Buying Settings,Purchase Receipt Required,የግዢ ደረሰኝ ያስፈልጋል
 DocType: Sales Invoice,Rail,ባቡር
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ትክክለኛ ወጪ።
@@ -1061,6 +1065,7 @@
 DocType: Production Plan,Production Plan,የምርት ዕቅድ
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,የጋብቻ ክፍያ መጠየቂያ መሳሪያ መፍጠሩ
 DocType: Salary Component,Round to the Nearest Integer,ወደ ቅርብ integer Integer።
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,በክምችት ውስጥ የሌሉ ዕቃዎች ወደ ጋሪ እንዲጨምሩ ይፍቀዱ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,የሽያጭ ተመለስ
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,በ Serial No Entput ላይ በመመርኮዝ ስንት ግምት ያዘጋጁ
 ,Total Stock Summary,ጠቅላላ የአክሲዮን ማጠቃለያ
@@ -1190,6 +1195,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),የመሠረት ሰዓት ተመን (የኩባንያ የምንዛሬ)
 ,Qty To Be Billed,እንዲከፍሉ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ደርሷል መጠን
+DocType: Coupon Code,Gift Card,ስጦታ ካርድ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ለምርቶቹ የተቀመጡ ጫፎች-ለማኑፋክቸሪንግ ዕቃዎች የሚውሉ ጥሬ ዕቃዎች ብዛት።
 DocType: Loyalty Point Entry Redemption,Redemption Date,የመቤዠት ቀን
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,ይህ የባንክ ግብይት ቀድሞውኑ ሙሉ በሙሉ ታረቀ።
@@ -1277,6 +1283,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,የጊዜ ሰሌዳ ይፍጠሩ።
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,የክፍያ መጠየቂያ ደረሰኞችን ይግዙ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,አባልነትዎ በ 30 ቀናት ውስጥ የሚያልቅ ከሆነ ብቻ መታደስ የሚችሉት
 DocType: Shopping Cart Settings,Show Stock Availability,የኤክስቴንሽን አቅርቦት አሳይ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},{0} ን በንብረት ምድብ {1} ወይም ኩባንያ {2} ውስጥ ያዘጋጁ
@@ -1553,7 +1560,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",የተያዙ ጫፎች ብዛት ለሽያጭ የታዘዘ ፣ ግን አልደረሰም ፡፡
 DocType: Drug Prescription,Interval UOM,የጊዜ ክፍተት UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",የተመረጠው አድራሻ ከተቀመጠ በኋላ ማስተካከያ ከተደረገበት አይምረጡ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,የተያዙ ዕቃዎች ለንዑስ-ኮንትራክተር-ንዑስ-ንዑስ ንጥል ነገሮችን ለመስራት ጥሬ ዕቃዎች ብዛት።
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,የተያዙ ዕቃዎች ለንዑስ-ኮንትራክተር-ንዑስ-ንዑስ ንጥል ነገሮችን ለመስራት ጥሬ ዕቃዎች ብዛት።
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 DocType: Item,Hub Publishing Details,ሃቢ የህትመት ዝርዝሮች
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;በመክፈት ላይ&#39;
@@ -1816,6 +1823,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,እቃዎችን እና UOM ን ማስመጣት ፡፡
 DocType: Repayment Schedule,Balance Loan Amount,ቀሪ የብድር መጠን
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,ወደ ዝርዝር ታክሏል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",ይቅርታ ፣ የኩፖን ኮድ ደክሟል
 DocType: Communication Medium,Catch All,ሁሉንም ይያዙ።
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,መርሐግብር ኮርስ
 DocType: Budget,Applicable on Material Request,በወሳኝ ጥያቄ ላይ ተፈጻሚነት ይኖረዋል
@@ -1983,6 +1991,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,የኢሜል ዘመቻዎች ፡፡
+DocType: Sales Partner,To Track inbound purchase,ወደ ውስጥ ገቢ ግ Trackን ለመከታተል
 DocType: Buying Settings,Default Supplier Group,ነባሪ የአቅራቢ ቡድን
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},ለክፍለ አካል ከሚፈቀደው ከፍተኛ መጠን {0} ይበልጣል {1}
@@ -2138,7 +2147,6 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,የአክሲዮን ግባን ያድርጉ ፡፡
 DocType: Hotel Room Reservation,Hotel Reservation User,የሆቴል መያዣ ተጠቃሚ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ሁኔታን ያዘጋጁ።
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝተው በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ።
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Contract,Fulfilment Deadline,የማረጋገጫ ጊዜ ገደብ
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,በአጠገብህ
@@ -2263,6 +2271,7 @@
 DocType: Quality Meeting Table,Under Review,በ ግምገማ ላይ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,ለመግባት ተስኗል
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,ንብረት {0} ተፈጥሯል
+DocType: Coupon Code,Promotional,ማስተዋወቂያ
 DocType: Special Test Items,Special Test Items,ልዩ የፈተና ንጥሎች
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,በገበያ ቦታ ላይ ለመመዝገብ የስርዓት አቀናባሪ እና የንጥል አስተዳዳሪ ሚናዎች ተጠቃሚ መሆን አለብዎት.
 apps/erpnext/erpnext/config/buying.py,Key Reports,ቁልፍ ሪፖርቶች ፡፡
@@ -2300,6 +2309,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,የሰነድ ዓይነት
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
 DocType: Subscription Plan,Billing Interval Count,የማስከፈያ የጊዜ ክፍተት ቆጠራ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,ቀጠሮዎች እና የታካሚ መጋጠሚያዎች
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,እሴት ይጎድላል
 DocType: Employee,Department and Grade,መምሪያ እና ደረጃ
@@ -2402,6 +2413,7 @@
 DocType: Project,Start and End Dates,ይጀምሩ እና ቀኖች የማይኖርበት
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,የውጤት ቅጽ ቅንጅቶች ውሎች
 ,Delivered Items To Be Billed,የደረሱ ንጥሎች እንዲከፍሉ ለማድረግ
+DocType: Coupon Code,Maximum Use,ከፍተኛ አጠቃቀም
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ክፍት BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,መጋዘን መለያ ቁጥር ሊቀየር አይችልም
 DocType: Authorization Rule,Average Discount,አማካይ ቅናሽ
@@ -2563,6 +2575,7 @@
 DocType: Item,Inventory,ንብረት ቆጠራ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,እንደ ጆንሰን አውርድ ፡፡
 DocType: Item,Sales Details,የሽያጭ ዝርዝሮች
+DocType: Coupon Code,Used,ያገለገሉ
 DocType: Opportunity,With Items,ንጥሎች ጋር
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',ዘመቻው &#39;{0}&#39; ቀድሞውኑ ለ {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,የጥገና ቡድን
@@ -2692,7 +2705,7 @@
 						Serial No cannot be ensured",ለንጥል {0} ምንም ገባሪ ቦም አልተገኘም. በ \ Serial No መላክ አይረጋግጥም
 DocType: Sales Partner,Sales Partner Target,የሽያጭ ባልደረባ ዒላማ
 DocType: Loan Type,Maximum Loan Amount,ከፍተኛ የብድር መጠን
-DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
+DocType: Coupon Code,Pricing Rule,የዋጋ አሰጣጥ ደንብ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},ተማሪ የተባዙ ጥቅል ቁጥር {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,ትዕዛዝ ግዢ ቁሳዊ ጥያቄ
 DocType: Company,Default Selling Terms,ነባሪ የመሸጫ ውሎች።
@@ -2771,6 +2784,7 @@
 DocType: Payment Schedule,Payment Amount,የክፍያ መጠን
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,የግማሽ ቀን ቀን ከሥራ ቀን እና የስራ መጨረሻ ቀን መሃል መካከል መሆን አለበት
 DocType: Healthcare Settings,Healthcare Service Items,የጤና እንክብካቤ አገልግሎት እቃዎች
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,ልክ ያልሆነ የአሞሌ ኮድ ከዚህ ባርኮድ ጋር የተገናኘ ንጥል የለም።
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,ፍጆታ መጠን
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,በጥሬ ገንዘብ ውስጥ የተጣራ ለውጥ
 DocType: Assessment Plan,Grading Scale,አሰጣጥ በስምምነት
@@ -2890,7 +2904,6 @@
 DocType: Share Transfer,Asset Account,የንብረት መለያ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,አዲስ የተለቀቀበት ቀን ለወደፊቱ መሆን አለበት።
 DocType: Purchase Invoice,End date of current invoice's period,የአሁኑ መጠየቂያ ያለው ክፍለ ጊዜ መጨረሻ ቀን
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንብሮች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ ፡፡
 DocType: Lab Test,Technician Name,የቴክኒክ ስም
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3000,6 +3013,7 @@
 DocType: Products Settings,Hide Variants,ልዩነቶችን ደብቅ።
 DocType: Lead,Next Contact By,በ ቀጣይ እውቂያ
 DocType: Compensatory Leave Request,Compensatory Leave Request,የማካካሻ ፍቃድ ጥያቄ
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",በንጥል {0} በተከታታይ {1} ከ {2} በላይ መብለጥ አይቻልም። ከመጠን በላይ ክፍያ መጠየቅን ለመፍቀድ እባክዎ በመለያዎች ቅንብሮች ውስጥ አበል ያዘጋጁ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},ረድፍ ውስጥ ንጥል {0} ያስፈልጋል ብዛት {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},የብዛት ንጥል የለም እንደ መጋዘን {0} ሊሰረዝ አይችልም {1}
 DocType: Blanket Order,Order Type,ትዕዛዝ አይነት
@@ -3169,7 +3183,6 @@
 DocType: Student,Student Mobile Number,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Item,Has Variants,ተለዋጮች አለው
 DocType: Employee Benefit Claim,Claim Benefit For,የድጐማ ማመልከት ለ
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{0} በ {1} ከ {2} በላይ በአለው ነገር ላይ ማለፍ አይቻልም. ከመጠን በላይ-ወጪ የሚጠይቁትን, እባክዎ በማከማቻ ቅንጅቶች ውስጥ ያስቀምጡ"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,ምላሽ ስጥ
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
@@ -3458,6 +3471,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,ኩባንያ ውስጥ ምንዛሬ ይግለጹ
 DocType: Workstation,Wages per hour,በሰዓት የደመወዝ
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},አዋቅር {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የደንበኞች ቡድን&gt; ክልል
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,ቁሳዊ ጥያቄዎች የሚከተሉት ንጥል ዳግም-ትዕዛዝ ደረጃ ላይ ተመስርቶ በራስ-ሰር ከፍ ተደርጓል
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
@@ -3787,6 +3801,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,የቀጣሪ አስገባ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,በተጠንቀቅ
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,ማከለያ ቢያንስ አንድ ትክክለኛ አማራጮች ሊኖሩት ይገባል።
+apps/erpnext/erpnext/hooks.py,Purchase Orders,የግ Or ትዕዛዞች
 DocType: Account,Inter Company Account,የቡድን ኩባንያ ሂሳብ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,የጅምላ ውስጥ አስመጣ
 DocType: Sales Partner,Address & Contacts,አድራሻ እና እውቂያዎች
@@ -3797,6 +3812,7 @@
 DocType: POS Profile,[Select],[ምረጥ]
 DocType: Staffing Plan Detail,Number Of Positions,የፖስታ ቁጥር
 DocType: Vital Signs,Blood Pressure (diastolic),የደም ግፊት (ዳቲኮል)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,እባክዎ ደንበኛውን ይምረጡ።
 DocType: SMS Log,Sent To,ወደ ተልኳል
 DocType: Agriculture Task,Holiday Management,የበዓል አያያዝ
 DocType: Payment Request,Make Sales Invoice,የሽያጭ ደረሰኝ አድርግ
@@ -4006,7 +4022,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ማቅረብ አይደለም
 DocType: Subscription,Trialling,ፈዛዛ
 DocType: Sales Invoice Item,Deferred Revenue,የተዘገበው ገቢ
-DocType: Bank Account,GL Account,GL መለያ።
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,የገንዘብ መለያ ለሽያጭ ደረሰኝ ፍጆታ ያገለግላል
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,የተፈለገው ንዑስ ምድብ
 DocType: Member,Membership Expiry Date,የአባልነት ጊዜ ማብቂያ ቀን
@@ -4408,13 +4423,13 @@
 DocType: C-Form Invoice Detail,Territory,ግዛት
 DocType: Pricing Rule,Apply Rule On Item Code,በንጥል ኮድ ላይ ይተግብሩ።
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,የአክሲዮን ቀሪ ሂሳብ ሪፖርት
 DocType: Stock Settings,Default Valuation Method,ነባሪ ዋጋ ትመና ዘዴው
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,ክፍያ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,የተደመረው መጠን አሳይ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,በሂደት ላይ ያለ ዝማኔ. የተወሰነ ጊዜ ሊወስድ ይችላል.
 DocType: Production Plan Item,Produced Qty,ያመረተ
 DocType: Vehicle Log,Fuel Qty,የነዳጅ ብዛት
-DocType: Stock Entry,Target Warehouse Name,የዒላማ መሸጫ ስም
 DocType: Work Order Operation,Planned Start Time,የታቀደ መጀመሪያ ጊዜ
 DocType: Course,Assessment,ግምገማ
 DocType: Payment Entry Reference,Allocated,የተመደበ
@@ -4480,10 +4495,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","መደበኛ ውሎች እና ሽያጭ እና ግዢዎች ሊታከሉ የሚችሉ ሁኔታዎች. ምሳሌዎች: ቅናሽ 1. ስለሚቆይበት. 1. የክፍያ ውል (ምንጭ ላይ የቅድሚያ ውስጥ, ክፍል አስቀድመህ ወዘተ). 1. ተጨማሪ (ወይም የደንበኛ የሚከፈል) ምንድን ነው. 1. ደህንነት / የአጠቃቀም ማስጠንቀቂያ. 1. ዋስትና ካለ. 1. መመሪያ ያወጣል. መላኪያ 1. ውል, የሚመለከተው ከሆነ. ክርክሮችን ለመፍታት, ጥቅማጥቅም, ተጠያቂነት 1. መንገዶች, ወዘተ 1. አድራሻ እና የእርስዎ ኩባንያ ያግኙን."
 DocType: Homepage Section,Section Based On,ክፍል ላይ የተመሠረተ።
+DocType: Shopping Cart Settings,Show Apply Coupon Code,ተግብር ኩፖን ኮድ አሳይ
 DocType: Issue,Issue Type,የችግር አይነት
 DocType: Attendance,Leave Type,ፈቃድ አይነት
 DocType: Purchase Invoice,Supplier Invoice Details,አቅራቢ የደረሰኝ ዝርዝሮች
 DocType: Agriculture Task,Ignore holidays,በዓላትን ችላ ይበሉ
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,የኩፖን ሁኔታዎችን ያክሉ / ያርትዑ
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ወጪ / መማሩ መለያ ({0}) አንድ &#39;ትርፍ ወይም ኪሳራ&#39; መለያ መሆን አለበት
 DocType: Stock Entry Detail,Stock Entry Child,የአክሲዮን ግቤት ልጅ።
 DocType: Project,Copied From,ከ ተገልብጧል
@@ -4658,6 +4675,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ግምገማ ዕቅድ መስፈርት
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,ግብይቶች
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,የግዢ ትዕዛዞችን ይከላከሉ
+DocType: Coupon Code,Coupon Name,የኩፖን ስም
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,በቀላሉ ሊታወቅ የሚችል
 DocType: Email Campaign,Scheduled,የተያዘለት
 DocType: Shift Type,Working Hours Calculation Based On,የስራ ሰዓቶች ስሌት ላይ የተመሠረተ።
@@ -4674,7 +4692,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,ተለዋጮችን ይፍጠሩ።
 DocType: Vehicle,Diesel,በናፍጣ
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,የዋጋ ዝርዝር ምንዛሬ አልተመረጠም
+DocType: Quick Stock Balance,Available Quantity,የሚገኝ ብዛት
 DocType: Purchase Invoice,Availed ITC Cess,በ ITC Cess ማግኘት
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪን የማኔጅመንት ስርዓት ያዋቅሩ
 ,Student Monthly Attendance Sheet,የተማሪ ወርሃዊ ክትትል ሉህ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,የማጓጓዣ ደንብ ለሽያጭ ብቻ ነው የሚመለከተው
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,የአከፋፈል ቅደም ተከተራ {0}: የቀጣዩ ቀን ቅነሳ ቀን ከግዢ ቀን በፊት ሊሆን አይችልም
@@ -4742,6 +4762,7 @@
 DocType: Quality Meeting,Quality Meeting,ጥራት ያለው ስብሰባ።
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ወደ ቡድን ያልሆነ ቡድን
 DocType: Employee,ERPNext User,ERPNext User
+DocType: Coupon Code,Coupon Description,የኩፖን መግለጫ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},ባች ረድፍ ላይ ግዴታ ነው {0}
 DocType: Company,Default Buying Terms,ነባሪ የግying ውል።
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,የግዢ ደረሰኝ ንጥል አቅርቦት
@@ -4904,6 +4925,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,የሰነድ ዝርዝር ላይ የለም
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ስረዛ ለአገር {0} አይፈቀድም
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,የድግስ አይነት ግዴታ ነው
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,የኩፖን ኮድ ይተግብሩ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",ለስራ ካርድ {0} ፣ እርስዎ የ ‹ቁሳቁስ ሽግግር ለአምራች› ዓይነት የአክሲዮን ግቤት ብቻ ማድረግ ይችላሉ ፡፡
 DocType: Quality Inspection,Outgoing,የወጪ
 DocType: Customer Feedback Table,Customer Feedback Table,የደንበኛ ግብረ መልስ ሰንጠረዥ
@@ -5053,7 +5075,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,የግcha ትዕዛዝ ማቅረቢያ ላይ።
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ሁሉንም አቅራቢዎች አክል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,የረድፍ # {0}: የተመደበ መጠን የላቀ መጠን የበለጠ ሊሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ክልል።
 DocType: Tally Migration,Parties,ፓርቲዎች ፡፡
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,አስስ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
@@ -5085,7 +5106,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ለንጥል የተለየ አማራጭ ለማዘጋጀት አይፈቀድም {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,ቀን ተደግሟል
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,የተፈቀደላቸው የፈራሚ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ።
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),የተጣራ ITC ይገኛል (ሀ) - (ለ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ክፍያዎች ይፍጠሩ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ጠቅላላ የግዢ ዋጋ (የግዢ ደረሰኝ በኩል)
@@ -5110,6 +5130,7 @@
 DocType: Quiz Result,Wrong,ስህተት።
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ፍጥነት ዋጋ ዝርዝር ምንዛሬ ላይ የደንበኛ መሰረት ከሆነው ምንዛሬ በመለወጥ ላይ ነው
 DocType: Purchase Invoice Item,Net Amount (Company Currency),የተጣራ መጠን (የኩባንያ የምንዛሬ)
+DocType: Sales Partner,Referral Code,ሪፈራል ኮድ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,የጠቅላላ የቅድመ ክፍያ መጠን ከማዕቀዛት ጠቅላላ መጠን በላይ ሊሆን አይችልም
 DocType: Salary Slip,Hour Rate,ሰዓቲቱም ተመን
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,ራስ-ማዘመኛን ያንቁ።
@@ -5238,6 +5259,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,የአክሲዮን ብዛት አሳይ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,ክወናዎች ከ የተጣራ ገንዘብ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},ረድፍ # {0}: ሁኔታ ለገንዘብ መጠየቂያ ቅናሽ {2} ሁኔታ {1} መሆን አለበት
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {1}) ለእንጥል አልተገኘም {{2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,ንጥል 4
 DocType: Student Admission,Admission End Date,የመግቢያ መጨረሻ ቀን
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,ንዑስ-የኮንትራት
@@ -5260,6 +5282,7 @@
 DocType: Travel Request,Fully Sponsored,ሙሉ በሙሉ የተደገፈ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,የተራዘመ የጆርናሉ ምዝገባ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,የሥራ ካርድ ይፍጠሩ ፡፡
+DocType: Quotation,Referral Sales Partner,ሪፈራል የሽያጭ አጋር
 DocType: Quality Procedure Process,Process Description,የሂደት መግለጫ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,ደንበኛ {0} ተፈጥሯል.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,በአሁኑ ጊዜ በማንኛውም መጋዘን ውስጥ ምንም አክሲዮስ የለም
@@ -5393,6 +5416,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM ተመን
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,የተጫነ ፋይል በማንበብ ላይ።
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","የተቋረጠው የሥራ ትዕዛዝ ሊተው አይችልም, መተው መጀመሪያ ይጥፉ"
+DocType: Coupon Code,Coupon Code,የኩፖን ኮድ
 DocType: Asset,Journal Entry for Scrap,ቁራጭ ለ ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,የመላኪያ ማስታወሻ የመጡ ንጥሎችን ለመንቀል እባክዎ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},ረድፍ {0}: ከግዜው ላይ {1}
@@ -5475,6 +5499,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;ቀን&#39; ያስፈልጋል።
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,የውሂብ ያስመጡ እና ወደ ውጪ ላክ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",ይቅርታ ፣ የኩፖን ኮድ ትክክለኛነት ጊዜው አልፎበታል
 DocType: Bank Account,Account Details,የመለያ ዝርዝሮች
 DocType: Crop,Materials Required,አስፈላጊ ነገሮች
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,ምንም ተማሪዎች አልተገኙም
@@ -5512,6 +5537,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,ወደ ተጠቃሚዎች ሂድ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,የሚከፈልበት መጠን መጠን ግራንድ ጠቅላላ በላይ ሊሆን አይችልም ጠፍቷል ጻፍ; +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ንጥል ትክክለኛ ባች ቁጥር አይደለም {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,እባክዎ ትክክለኛ የኩፖን ኮድ ያስገቡ !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},ማስታወሻ: አይተውህም ዓይነት በቂ ፈቃድ ቀሪ የለም {0}
 DocType: Task,Task Description,የተግባር መግለጫ።
 DocType: Training Event,Seminar,ሴሚናሩ
@@ -5775,6 +5801,7 @@
 ,TDS Payable Monthly,TDS የሚከፈል ወርሃዊ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,ቦም (BOM) ለመተመን ተሰልፏል. ጥቂት ደቂቃዎችን ሊወስድ ይችላል.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንጅቶች ውስጥ የሰራተኛ መለያ ስም መስጫ ስርዓትን ያዋቅሩ
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,ጠቅላላ ክፍያዎች።
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serialized ንጥል ሲሪያል ቁጥሮች ያስፈልጋል {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,ደረሰኞች ጋር አዛምድ ክፍያዎች
@@ -5864,6 +5891,7 @@
 DocType: Production Plan,Get Raw Materials For Production,ለማምረት ጥሬ ዕቃዎችን ያግኙ
 DocType: Job Opening,Job Title,የስራ መደቡ መጠሪያ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,የወደፊት ክፍያ Ref
+DocType: Quotation,Additional Discount and Coupon Code,ተጨማሪ ቅናሽ እና የኩፖን ኮድ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} እንደሚያሳየው {1} የጥቅስ ነገርን አያቀርብም, ነገር ግን ሁሉም ንጥሎች \ ተወስደዋል. የ RFQ መጠይቅ ሁኔታን በማዘመን ላይ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,ከፍተኛ ቁጥር ያላቸው - {0} አስቀድመው በቡድን {1} እና በንጥል {2} በቡድን {3} ውስጥ ተይዘው ተቀምጠዋል.
@@ -6091,7 +6119,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,ድር መነሻ ገጽ ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} ያቆመበት እስከ {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},በ {0} ነጥብ የምርጫ ካርድ ደረጃ ምክንያት በ {0} አይፈቀድም RFQs አይፈቀዱም.
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,የክፍያ መጠየቂያ ደረሰኝ ይግዙ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,ጥቅም ላይ የዋሉ ቅጠሎች
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} ያገለገሉ ኩፖኖች {1} ናቸው። የተፈቀደው ብዛት ደክሟል
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,የቁሳዊ ጥያቄውን ማስገባት ይፈልጋሉ?
 DocType: Job Offer,Awaiting Response,ምላሽ በመጠባበቅ ላይ
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-yYYYY.-
@@ -6105,6 +6135,7 @@
 DocType: Training Event Employee,Optional,አማራጭ
 DocType: Salary Slip,Earning & Deduction,ገቢ እና ተቀናሽ
 DocType: Agriculture Analysis Criteria,Water Analysis,የውሃ ትንተና
+DocType: Sales Order,Skip Delivery Note,ማቅረቢያ ማስታወሻ ዝለል
 DocType: Price List,Price Not UOM Dependent,ዋጋ UOM ጥገኛ አይደለም።
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} ፈጣሪዎች ተፈጥረዋል.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,ነባሪ የአገልግሎት ደረጃ ስምምነት ቀድሞውኑ አለ።
@@ -6209,6 +6240,7 @@
 DocType: Vehicle,Last Carbon Check,የመጨረሻው ካርቦን ፈትሽ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,የህግ ወጪዎች
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,ረድፍ ላይ ብዛት ይምረጡ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},የሥራ ትእዛዝ {0}: - የሥራው ካርድ ለኦፕሬሽኑ አልተገኘም {1}
 DocType: Purchase Invoice,Posting Time,መለጠፍ ሰዓት
 DocType: Timesheet,% Amount Billed,% መጠን የሚከፈል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,የስልክ ወጪ
@@ -6311,7 +6343,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ግብሮች እና ክፍያዎች ታክሏል
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,የአከፋፈል ቅደም ተከተልን {0}: የሚቀጥለው የአለሜሽን ቀን ከክፍያ ጋር ለመገናኘት የሚውል ቀን ከመሆኑ በፊት ሊሆን አይችልም
 ,Sales Funnel,የሽያጭ ማጥለያ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም።
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ጋሪ
@@ -6406,6 +6437,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",የታማኝነት ስብስብ ነጥቦች ከተጠቀሰው ጊዜ (በሽያጭ ደረሰኝ በኩል) ተወስዶ የተሰራውን መሰረት በማድረግ ነው.
 DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
+DocType: Pricing Rule,Coupon Code Based,የኩፖን ኮድ የተመሠረተ
 DocType: Company,HRA Settings,HRA ቅንብሮች
 DocType: Homepage,Hero Section,ጀግና ክፍል ፡፡
 DocType: Employee Transfer,Transfer Date,የማስተላለፍ ቀን
@@ -6521,6 +6553,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',የቡድን በ «ኩባንያ &#39;ከሆነ ኩባንያ ባዶ ማጣሪያ ያዘጋጁ እባክዎ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,መለጠፍ ቀን ወደፊት ቀን ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},የረድፍ # {0}: መለያ አይ {1} ጋር አይዛመድም {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝተው በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ
 DocType: Stock Entry,Target Warehouse Address,የዒላማ መሸጫ ቤት አድራሻ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,ተራ ፈቃድ
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,የሰራተኛ ተመዝግቦ መግቢያ ለመገኘት የታሰበበት ከለውጥያው ጊዜ በፊት ያለው ሰዓት
@@ -6555,7 +6588,6 @@
 DocType: Employee Grade,Employee Grade,የሰራተኛ ደረጃ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ጭማቂዎች
 DocType: GSTR 3B Report,June,ሰኔ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት።
 DocType: Share Balance,From No,ከ
 DocType: Shift Type,Early Exit Grace Period,ቀደምት የመልቀቂያ ጊዜ።
 DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
@@ -6840,7 +6872,6 @@
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ሚና በማፅደቅ ወይም የተጠቃሚ በማፅደቅ ያስገቡ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {1}) ለእንጥል አልተገኘም {{2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,የአገልግሎት ደረጃ ስምምነት ከድርጅት ዓይነት {0} እና ህጋዊ አካል {1} ቀድሞውኑ አለ።
 DocType: Journal Entry,Write Off Entry,Entry ጠፍቷል ይጻፉ
 DocType: BOM,Rate Of Materials Based On,ደረጃ ይስጡ እቃዎች ላይ የተመረኮዘ ላይ
@@ -6978,6 +7009,7 @@
 DocType: Budget,Warn,አስጠንቅቅ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,ሁሉም ነገሮች ለዚህ የሥራ ትዕዛዝ ተላልፈዋል.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
+DocType: Bank Account,Company Account,የኩባንያ መለያ
 DocType: Asset Maintenance,Manufacturing User,ማኑፋክቸሪንግ ተጠቃሚ
 DocType: Purchase Invoice,Raw Materials Supplied,ጥሬ እቃዎች አቅርቦት
 DocType: Subscription Plan,Payment Plan,የክፍያ ዕቅድ
@@ -7018,6 +7050,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},በስርዓት ቅደም ተከተል ውስጥ {0} ({1}) ሊሠራ ከታቀደ ብዛት ({2}) መብለጥ የለበትም {3}
 DocType: Certification Application,Name of Applicant,የአመልካች ስም
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,የአምራች ሰዓት ሉህ.
+DocType: Quick Stock Balance,Quick Stock Balance,ፈጣን የአክሲዮን ሚዛን
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,ድምር
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ከምርት ግብይት በኋላ ተለዋዋጭ ባህሪያትን መለወጥ አይቻልም. ይህን ለማድረግ አዲስ ንጥል ማዘጋጀት ይኖርብዎታል.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,የ GoCardless SEPA ኃላፊ
@@ -7344,6 +7377,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} የቦዘነ ተማሪ ነው
 DocType: Employee,Health Details,የጤና ዝርዝሮች
+DocType: Coupon Code,Coupon Type,የኩፖን አይነት
 DocType: Leave Encashment,Encashable days,የሚጣሩ ቀናት
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,"የማጣቀሻ ሰነድ ያስፈልጋል ክፍያ ጥያቄ ለመፍጠር,"
 DocType: Soil Texture,Sandy Clay,ሳንዲ ሸክላ
@@ -7626,6 +7660,7 @@
 DocType: Hotel Room Package,Amenities,ምግቦች
 DocType: Accounts Settings,Automatically Fetch Payment Terms,የክፍያ ውሎችን በራስ-ሰር ያውጡ።
 DocType: QuickBooks Migrator,Undeposited Funds Account,ተመላሽ ያልተደረገ የገንዘብ ሒሳብ
+DocType: Coupon Code,Uses,ይጠቀማል
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,ባለብዙ ነባሪ የክፍያ ስልት አይፈቀድም
 DocType: Sales Invoice,Loyalty Points Redemption,የታማኝነት መክፈል ዋጋዎች
 ,Appointment Analytics,የቀጠሮ ትንታኔ
@@ -7642,6 +7677,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,ጠቅላላ በጀት
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,እርስዎ በዓመት ተማሪዎች ቡድኖች ለማድረግ ከሆነ ባዶ ይተዉት
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ከተመረጠ, ጠቅላላ የለም. የስራ ቀናት በዓላት ያካትታል; ይህም ደመወዝ በእያንዳንዱ ቀን ዋጋ እንዲቀንስ ያደርጋል"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,ጎራ ማከል አልተሳካም
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",ከደረሰኝ / ማድረስ በላይ ለመፍቀድ በአክሲዮን ቅንጅቶች ወይም በእቃው ውስጥ “ከደረሰኝ / ማቅረቢያ አበል” በላይ አዘምን።
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","የአሁኑን ቁልፍ የሚጠቀሙ መተግበሪያዎች መዳረስ አይችሉም, እርግጠኛ ነዎት?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7654,6 +7690,7 @@
 ,BOM Stock Report,BOM ስቶክ ሪፖርት
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",የተመደበው የጊዜ ሰሌዳ ከሌለ ታዲያ በዚህ ቡድን ግንኙነቶች ይከናወናል ፡፡
 DocType: Stock Reconciliation Item,Quantity Difference,የብዛት ለውጥ አምጥተዋል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት
 DocType: Opportunity Item,Basic Rate,መሰረታዊ ደረጃ
 DocType: GL Entry,Credit Amount,የብድር መጠን
 ,Electronic Invoice Register,የኤሌክትሮኒክ የክፍያ መጠየቂያ ምዝገባ
@@ -7907,6 +7944,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ግብሮች እና ክፍያዎች ተቀናሽ (የኩባንያ የምንዛሬ)
 DocType: Item Group,General Settings,ጠቅላላ ቅንብሮች
 DocType: Article,Article,አንቀጽ
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,እባክዎ የኩፖን ኮድ ያስገቡ !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ገንዘብና ጀምሮ እና ምንዛሬ ወደ አንድ ዓይነት ሊሆኑ አይችሉም
 DocType: Taxable Salary Slab,Percent Deduction,መቶኛ ማስተካከያ
 DocType: GL Entry,To Rename,እንደገና ለመሰየም።
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 60c5b51..b20bf97 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,معلومات اتصال العميل
 DocType: Shift Type,Enable Auto Attendance,تمكين الحضور التلقائي
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,الرجاء إدخال المستودع والتاريخ
 DocType: Lost Reason Detail,Opportunity Lost Reason,فرصة ضائعة السبب
 DocType: Patient Appointment,Check availability,التحقق من الصلاحية
 DocType: Retention Bonus,Bonus Payment Date,تاريخ دفع المكافأة
@@ -265,6 +266,7 @@
 ,Completed Work Orders,أوامر العمل المكتملة
 DocType: Support Settings,Forum Posts,مشاركات المنتدى
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",وقد تم إرساء المهمة كعمل خلفية. في حالة وجود أي مشكلة في المعالجة في الخلفية ، سيقوم النظام بإضافة تعليق حول الخطأ في تسوية المخزون هذا والعودة إلى مرحلة المسودة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",عذرًا ، لم تبدأ صلاحية رمز القسيمة
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,المبلغ الخاضع للضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: Leave Policy,Leave Policy Details,اترك تفاصيل السياسة
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,المواد المستهلكة
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,درجة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 DocType: Restaurant Table,No of Seats,عدد المقاعد
 DocType: Sales Invoice,Overdue and Discounted,المتأخرة و مخفضة
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,تم قطع الاتصال
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,سطر فارغ للمبلغ بالحروف
 DocType: Vehicle,Additional Details,تفاصيل اضافية
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,لم يتم اعطاء وصف
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,جلب العناصر من المستودع
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,طلب للشراء.
 DocType: POS Closing Voucher Details,Collected Amount,المبلغ المجمع
 DocType: Lab Test,Submitted Date,تاريخ التقديم / التسجيل
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,تعلم
 ,Trial Balance (Simple),ميزان المراجعة (بسيط)
 DocType: Purchase Invoice Item,Enable Deferred Expense,تمكين المصروفات المؤجلة
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,رمز القسيمة المطبق
 DocType: Asset,Next Depreciation Date,تاريخ االاستهالك التالي
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,تكلفة النشاط لكل موظف
 DocType: Accounts Settings,Settings for Accounts,إعدادات الحسابات
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,أمر العمل
 DocType: Sales Invoice,Total Qty,إجمالي الكمية
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 معرف البريد الإلكتروني
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 DocType: Item,Show in Website (Variant),مشاهدة في موقع (البديل)
 DocType: Employee,Health Concerns,شؤون صحية
 DocType: Payroll Entry,Select Payroll Period,تحديد فترة دفع الرواتب
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,حساب حجب الضرائب
 DocType: Pricing Rule,Sales Partner,شريك المبيعات
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,جميع نتائج الموردين
+DocType: Coupon Code,To be used to get discount,ليتم استخدامها للحصول على الخصم
 DocType: Buying Settings,Purchase Receipt Required,إيصال استلام المشتريات مطلوب
 DocType: Sales Invoice,Rail,سكة حديدية
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,التكلفة الفعلية
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,خطة الإنتاج
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,أداة إنشاء فاتورة افتتاحية
 DocType: Salary Component,Round to the Nearest Integer,جولة إلى أقرب عدد صحيح
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,السماح بإضافة العناصر غير الموجودة في المخزن إلى السلة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,مبيعات المعاده
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,تعيين الكمية في المعاملات استناداً إلى Serial No Input
 ,Total Stock Summary,ملخص إجمالي المخزون
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),سعر الساعة الأساسي (عملة الشركة)
 ,Qty To Be Billed,الكمية المطلوب دفعها
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,القيمة التي تم تسليمها
+DocType: Coupon Code,Gift Card,كرت هدية
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,الكمية المخصصة للإنتاج: كمية المواد الخام لتصنيع المواد.
 DocType: Loyalty Point Entry Redemption,Redemption Date,تاريخ الاسترداد
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,تمت تسوية هذه الصفقة المصرفية بالفعل بالكامل
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,إنشاء الجدول الزمني
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,تم إدخال الحساب {0} عدة مرات
 DocType: Account,Expenses Included In Valuation,المصروفات متضمنة في تقييم السعر
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,فواتير الشراء
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,يمكنك تجديد عضويتك اذا انتهت عضويتك خلال 30 يوما
 DocType: Shopping Cart Settings,Show Stock Availability,عرض توافر المخزون
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},تعيين {0} في فئة الأصول {1} أو الشركة {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",الكمية المحجوزة : الكمية المطلوبة لل بيع، ولكن لم يتم تسليمها .
 DocType: Drug Prescription,Interval UOM,الفاصل الزمني أوم
 DocType: Customer,"Reselect, if the chosen address is edited after save",إعادة تحديد، إذا تم تحرير عنوان المختار بعد حفظ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,الكمية المحجوزة للعقد من الباطن: كمية المواد الخام لصنع سلع من الباطن.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,الكمية المحجوزة للعقد من الباطن: كمية المواد الخام لصنع سلع من الباطن.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,متغير الصنف {0} موجود بالفعل مع نفس الخصائص
 DocType: Item,Hub Publishing Details,هاب تفاصيل النشر
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','افتتاحي'
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,استيراد العناصر و UOMs
 DocType: Repayment Schedule,Balance Loan Amount,رصيد مبلغ القرض
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,تم اضافته الى التفاصيل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",عذرا ، رمز الكوبون مستنفد
 DocType: Communication Medium,Catch All,قبض على الكل
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,دورة الجدول الزمني
 DocType: Budget,Applicable on Material Request,ينطبق على طلب المواد
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,خاصية غير صالحة
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} يجب أن يتم تقديمه
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,حملات البريد الإلكتروني
+DocType: Sales Partner,To Track inbound purchase,لتتبع الشراء الوارد
 DocType: Buying Settings,Default Supplier Group,مجموعة الموردين الافتراضية
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو تساوي {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},أقصى مبلغ مؤهل للعنصر {0} يتجاوز {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,جعل دخول الأسهم
 DocType: Hotel Room Reservation,Hotel Reservation User,فندق حجز المستخدم
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,تعيين الحالة
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,الرجاء اختيار البادئة اولا
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 DocType: Contract,Fulfilment Deadline,الموعد النهائي للوفاء
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,بالقرب منك
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,تحت المراجعة
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,فشل في تسجيل الدخول
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,تم إنشاء الأصل {0}
+DocType: Coupon Code,Promotional,الترويجية
 DocType: Special Test Items,Special Test Items,عناصر الاختبار الخاصة
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,يجب أن تكون مستخدمًا بأدوار مدير النظام و مدير الصنف للتسجيل في Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,التقارير الرئيسية
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,نوع الوثيقة
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
 DocType: Subscription Plan,Billing Interval Count,عدد الفواتير الفوترة
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,المواعيد ومواجهات المرضى
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,القيمة مفقودة
 DocType: Employee,Department and Grade,قسم والصف
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,تواريخ البدء والانتهاء
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,شروط استيفاء قالب العقد
 ,Delivered Items To Be Billed,مواد سلمت و لم يتم اصدار فواتيرها
+DocType: Coupon Code,Maximum Use,الاستخدام الأقصى
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},فتح قائمة المواد {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,لا يمكن تغيير الرقم التسلسلي لل مستودع
 DocType: Authorization Rule,Average Discount,متوسط الخصم
@@ -2585,6 +2598,7 @@
 DocType: Item,Inventory,جرد
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,تنزيل باسم Json
 DocType: Item,Sales Details,تفاصيل المبيعات
+DocType: Coupon Code,Used,مستخدم
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',الحملة &#39;{0}&#39; موجودة بالفعل لـ {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,فريق الصيانة
@@ -2714,7 +2728,7 @@
 						Serial No cannot be ensured",لم يتم العثور على BOM نشط للعنصر {0}. التسليم عن طريق \ Serial لا يمكن ضمانه
 DocType: Sales Partner,Sales Partner Target,المبلغ المطلوب للمندوب
 DocType: Loan Type,Maximum Loan Amount,أعلى قيمة للقرض
-DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
+DocType: Coupon Code,Pricing Rule,قاعدة التسعير
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Material Request to Purchase Order
 DocType: Company,Default Selling Terms,شروط البيع الافتراضية
@@ -2793,6 +2807,7 @@
 DocType: Payment Schedule,Payment Amount,دفع مبلغ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,يجب أن يكون تاريخ نصف يوم بين العمل من التاريخ وتاريخ انتهاء العمل
 DocType: Healthcare Settings,Healthcare Service Items,عناصر خدمة الرعاية الصحية
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,الباركود غير صالح. لا يوجد عنصر مرفق بهذا الرمز الشريطي.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,القيمة المستهلكة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,صافي التغير في النقد
 DocType: Assessment Plan,Grading Scale,مقياس الدرجات
@@ -2912,7 +2927,6 @@
 DocType: Share Transfer,Asset Account,حساب الأصول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,يجب أن يكون تاريخ الإصدار الجديد في المستقبل
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Lab Test,Technician Name,اسم فني
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3024,6 +3038,7 @@
 DocType: Products Settings,Hide Variants,إخفاء المتغيرات
 DocType: Lead,Next Contact By,جهة الاتصال التالية بواسطة
 DocType: Compensatory Leave Request,Compensatory Leave Request,طلب الإجازة التعويضية
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",لا يمكن زيادة حجم العنصر {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة ، يرجى تعيين بدل في إعدادات الحسابات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},الكمية المطلوبة للبند {0} في الصف {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},مستودع {0} لا يمكن حذف كما توجد كمية القطعة ل {1}
 DocType: Blanket Order,Order Type,نوع الطلب
@@ -3193,7 +3208,6 @@
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
 DocType: Employee Benefit Claim,Claim Benefit For,فائدة للمطالبة
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",لا يمكن المبالغة في البند {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة، يرجى تعيينه في إعدادات الأسهم
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,تحديث الرد
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
@@ -3483,6 +3497,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,يرجى تحديد العملة للشركة
 DocType: Workstation,Wages per hour,الأجور في الساعة
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},تكوين {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
@@ -3812,6 +3827,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,الموافقة كشف الرواتب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,في الانتظار
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,يجب أن يحتوي qustion على خيارات صحيحة واحدة على الأقل
+apps/erpnext/erpnext/hooks.py,Purchase Orders,طلبات الشراء
 DocType: Account,Inter Company Account,حساب الشركة المشترك
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,استيراد بكميات كبيرة
 DocType: Sales Partner,Address & Contacts,معلومات الاتصال والعنوان
@@ -3822,6 +3838,7 @@
 DocType: POS Profile,[Select],[اختر ]
 DocType: Staffing Plan Detail,Number Of Positions,عدد المناصب
 DocType: Vital Signs,Blood Pressure (diastolic),ضغط الدم (الانبساطي)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,يرجى اختيار العميل.
 DocType: SMS Log,Sent To,يرسل الى
 DocType: Agriculture Task,Holiday Management,إدارة العطلات
 DocType: Payment Request,Make Sales Invoice,انشاء فاتورة المبيعات
@@ -4031,7 +4048,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} لم يتم تقديمه
 DocType: Subscription,Trialling,تجربته
 DocType: Sales Invoice Item,Deferred Revenue,الإيرادات المؤجلة
-DocType: Bank Account,GL Account,حساب غوغل
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,سيستخدم الحساب النقدي لإنشاء فاتورة المبيعات
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,الإعفاء الفئة الفرعية
 DocType: Member,Membership Expiry Date,تاريخ انتهاء العضوية
@@ -4455,13 +4471,13 @@
 DocType: C-Form Invoice Detail,Territory,إقليم
 DocType: Pricing Rule,Apply Rule On Item Code,تطبيق القاعدة على رمز البند
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,يرجى ذكر عدد الزيارات المطلوبة
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,تقرير رصيد المخزون
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,رسوم
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,إظهار المبلغ التراكمي
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,التحديث قيد التقدم. قد يستغرق بعض الوقت.
 DocType: Production Plan Item,Produced Qty,الكمية المنتجة
 DocType: Vehicle Log,Fuel Qty,كمية الوقود
-DocType: Stock Entry,Target Warehouse Name,اسم المستودع المستهدف
 DocType: Work Order Operation,Planned Start Time,المخططة بداية
 DocType: Course,Assessment,تقييم
 DocType: Payment Entry Reference,Allocated,تخصيص
@@ -4539,10 +4555,12 @@
  1. سبل معالجة النزاعات، التعويض، والمسؤولية، الخ 
  1. معالجة والاتصال من الشركة الخاصة بك."
 DocType: Homepage Section,Section Based On,قسم بناء على
+DocType: Shopping Cart Settings,Show Apply Coupon Code,إظهار تطبيق رمز القسيمة
 DocType: Issue,Issue Type,نوع القضية
 DocType: Attendance,Leave Type,نوع الاجازة
 DocType: Purchase Invoice,Supplier Invoice Details,المورد تفاصيل الفاتورة
 DocType: Agriculture Task,Ignore holidays,تجاهل العطلات
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,إضافة / تحرير شروط القسيمة
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر
 DocType: Stock Entry Detail,Stock Entry Child,الأسهم دخول الطفل
 DocType: Project,Copied From,تم نسخها من
@@ -4717,6 +4735,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة التقييم
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,المعاملات
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,منع أوامر الشراء
+DocType: Coupon Code,Coupon Name,اسم القسيمة
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,سريع التأثر
 DocType: Email Campaign,Scheduled,من المقرر
 DocType: Shift Type,Working Hours Calculation Based On,ساعات العمل حساب على أساس
@@ -4733,7 +4752,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,إنشاء المتغيرات
 DocType: Vehicle,Diesel,ديزل
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,قائمة أسعار العملات غير محددة
+DocType: Quick Stock Balance,Available Quantity,الكمية المتوفرة
 DocType: Purchase Invoice,Availed ITC Cess,استفاد من إيتس سيس
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 ,Student Monthly Attendance Sheet,طالب ورقة الحضور الشهري
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,الشحن القاعدة المعمول بها فقط للبيع
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك قبل تاريخ الشراء
@@ -4800,8 +4821,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,الصف {0}:  الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن
 DocType: Quality Meeting,Quality Meeting,اجتماع الجودة
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,من تصنيف (غير المجموعة) إلى تصنيف ( المجموعة)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 DocType: Employee,ERPNext User,ERPNext المستخدم
+DocType: Coupon Code,Coupon Description,وصف القسيمة
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},الدفعة إلزامية على التوالي {0}
 DocType: Company,Default Buying Terms,شروط الشراء الافتراضية
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,شراء السلعة استلام الموردة
@@ -4964,6 +4985,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,مقابل المستند التفصيلى رقم
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},الحذف غير مسموح به في البلد {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,نوع الطرف المعني إلزامي
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,تطبيق رمز القسيمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",بالنسبة لبطاقة المهمة {0} ، يمكنك فقط إدخال إدخال نوع الأسهم &quot;نقل المواد للصناعة&quot;
 DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Customer Feedback Table,Customer Feedback Table,جدول ملاحظات العملاء
@@ -5113,7 +5135,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,عند تقديم طلب الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,إضافة جميع الموردين
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Tally Migration,Parties,حفلات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,تصفح قائمة المواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,القروض المضمونة
@@ -5145,7 +5166,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},لا تسمح بتعيين عنصر بديل للعنصر {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,التاريخ مكرر
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,المخول بالتوقيع
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),صافي ITC المتوفر (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,إنشاء رسوم
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
@@ -5170,6 +5190,7 @@
 DocType: Quiz Result,Wrong,خطأ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ  ( بعملة الشركة )
+DocType: Sales Partner,Referral Code,كود الإحالة
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,لا يمكن أن يكون إجمالي المبلغ المدفوع أكبر من المبلغ الإجمالي المعتمد
 DocType: Salary Slip,Hour Rate,سعرالساعة
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,تمكين إعادة الطلب التلقائي
@@ -5298,6 +5319,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,عرض كمية المخزون
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,صافي النقد من العمليات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},الصف # {0}: يجب أن تكون الحالة {1} بالنسبة لخصم الفاتورة {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,صنف رقم 4
 DocType: Student Admission,Admission End Date,تاريخ انتهاء القبول
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,التعاقد من الباطن
@@ -5320,6 +5342,7 @@
 DocType: Travel Request,Fully Sponsored,برعاية كاملة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,عكس دخول المجلة
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,إنشاء بطاقة العمل
+DocType: Quotation,Referral Sales Partner,شريك مبيعات الإحالة
 DocType: Quality Procedure Process,Process Description,وصف العملية
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,تم إنشاء العميل {0}.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,حاليا لا يوجد مخزون متاح في أي مستودع
@@ -5454,6 +5477,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,سعر قائمة المواد
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,قراءة ملف تم الرفع
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء طلب العمل المتوقف ، قم بإلغاء إيقافه أولاً للإلغاء
+DocType: Coupon Code,Coupon Code,رمز الكوبون
 DocType: Asset,Journal Entry for Scrap,قيد دفتر يومية للتخريد
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,يرجى سحب البنوود من اشعار التسليم
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},الصف {0}: حدد محطة العمل مقابل العملية {1}
@@ -5536,6 +5560,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&quot;التاريخ&quot; مطلوب
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},تاريخ الاستحقاق أو المرجع لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,استيراد وتصدير البيانات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",عفوًا ، انتهت صلاحية صلاحية رمز القسيمة
 DocType: Bank Account,Account Details,تفاصيل الحساب
 DocType: Crop,Materials Required,المواد المطلوبة
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,لم يتم العثور على أي طلاب
@@ -5573,6 +5598,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,انتقل إلى المستخدمين
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,المبلغ المدفوع + شطب المبلغ لا يمكن أن يكون أكبر من المجموع الكلي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ليس رقم الدفعة صالحة للصنف {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,الرجاء إدخال رمز القسيمة صالح!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},ملاحظة: لا يوجد رصيد إجازات كافي لنوع الإجازة {0}
 DocType: Task,Task Description,وصف المهمة
 DocType: Training Event,Seminar,ندوة
@@ -5836,6 +5862,7 @@
 ,TDS Payable Monthly,TDS مستحق الدفع شهريًا
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,في قائمة الانتظار لاستبدال BOM. قد يستغرق بضع دقائق.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"لا يمكن الخصم عندما تكون الفئة ""التقييم"" أو ""التقييم والإجمالي"""
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,مجموع المدفوعات
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},مسلسل نص مطلوب لل مسلسل البند {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,مطابقة المدفوعات مع الفواتير
@@ -5925,6 +5952,7 @@
 DocType: Production Plan,Get Raw Materials For Production,الحصول على المواد الخام للإنتاج
 DocType: Job Opening,Job Title,المسمى الوظيفي
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,الدفع في المستقبل المرجع
+DocType: Quotation,Additional Discount and Coupon Code,خصم إضافي ورمز القسيمة
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0} يشير إلى أن {1} لن يقدم اقتباس، ولكن يتم نقل جميع العناصر \ تم نقلها. تحديث حالة اقتباس الأسعار.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,الحد الأقصى للعينات - {0} تم الاحتفاظ به مسبقا للدفعة {1} و العنصر {2} في الدفعة {3}.
@@ -6152,7 +6180,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,إعدادات موقعه الإلكتروني
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} معلق حتى {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},لا يسمح ب رفق ل {0} بسبب وضع بطاقة الأداء ل {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,جعل فاتورة شراء
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,مغادرات مستخدمة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} القسيمة المستخدمة هي {1}. الكمية المسموح بها مستنفدة
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,هل ترغب في تقديم طلب المواد
 DocType: Job Offer,Awaiting Response,انتظار الرد
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6166,6 +6196,7 @@
 DocType: Training Event Employee,Optional,اختياري
 DocType: Salary Slip,Earning & Deduction,الكسب و الخصم
 DocType: Agriculture Analysis Criteria,Water Analysis,تحليل المياه
+DocType: Sales Order,Skip Delivery Note,تخطي ملاحظة التسليم
 DocType: Price List,Price Not UOM Dependent,السعر لا يعتمد على UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,تم إنشاء المتغيرات {0}.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,اتفاقية مستوى الخدمة الافتراضية موجودة بالفعل.
@@ -6270,6 +6301,7 @@
 DocType: Vehicle,Last Carbon Check,آخر تحقق للكربون
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,نفقات قانونية
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,يرجى تحديد الكمية على الصف
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},أمر العمل {0}: لم يتم العثور على بطاقة المهمة للعملية {1}
 DocType: Purchase Invoice,Posting Time,نشر التوقيت
 DocType: Timesheet,% Amount Billed,المبلغ٪ صفت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,نفقات الهاتف
@@ -6372,7 +6404,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل تاريخ المتاح للاستخدام
 ,Sales Funnel,قمع المبيعات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم المهمة
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,عربة
@@ -6468,6 +6499,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",سيتم احتساب نقاط الولاء من المبالغ التي تم صرفها (عبر فاتورة المبيعات) ، بناءً على عامل الجمع المذكور.
 DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
+DocType: Pricing Rule,Coupon Code Based,كود الكوبون
 DocType: Company,HRA Settings,إعدادات HRA
 DocType: Homepage,Hero Section,قسم البطل
 DocType: Employee Transfer,Transfer Date,تاريخ التحويل
@@ -6583,6 +6615,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',الرجاء تعيين فلتر الشركة فارغا إذا كانت المجموعة بي هي &#39;كومباني&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,تاريخ النشر لا يمكن أن يكون تاريخ مستقبلي
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},الصف # {0}: الرقم التسلسلي {1} لا يتطابق مع {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Stock Entry,Target Warehouse Address,عنوان المستودع المستهدف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,أجازة عادية
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,الوقت الذي يسبق وقت بدء التحول الذي يتم خلاله فحص تسجيل الموظف للحضور.
@@ -6617,7 +6650,6 @@
 DocType: Employee Grade,Employee Grade,درجة الموظف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,الأجرة المدفوعة لكمية العمل المنجز
 DocType: GSTR 3B Report,June,يونيو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 DocType: Share Balance,From No,من رقم
 DocType: Shift Type,Early Exit Grace Period,الخروج المبكر فترة سماح
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
@@ -6904,7 +6936,6 @@
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,الرجاء إدخال صلاحية المخول بالتصديق أو المستخدم المخول بالتصديق
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,اتفاقية مستوى الخدمة مع نوع الكيان {0} والكيان {1} موجودة بالفعل.
 DocType: Journal Entry,Write Off Entry,شطب الدخول
 DocType: BOM,Rate Of Materials Based On,سعرالمواد استنادا على
@@ -7043,6 +7074,7 @@
 DocType: Budget,Warn,تحذير
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,جميع الإصناف تم نقلها لأمر العمل
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، وجهود جديرة بالذكر يجب أن تدون في السجلات.
+DocType: Bank Account,Company Account,حساب الشركة
 DocType: Asset Maintenance,Manufacturing User,مستخدم التصنيع
 DocType: Purchase Invoice,Raw Materials Supplied,المواد الخام الموردة
 DocType: Subscription Plan,Payment Plan,خطة الدفع
@@ -7084,6 +7116,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}
 DocType: Certification Application,Name of Applicant,اسم صاحب الطلب
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,ورقة الوقت للتصنيع.
+DocType: Quick Stock Balance,Quick Stock Balance,رصيد سريع الأسهم
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,حاصل الجمع
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,لا يمكن تغيير خصائص المتغير بعد معاملة المخزون. سيكون عليك عمل عنصر جديد للقيام بذلك.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA التكليف
@@ -7410,6 +7443,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},الرجاء تعيين {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
 DocType: Employee,Health Details,تفاصيل الحالة الصحية
+DocType: Coupon Code,Coupon Type,نوع الكوبون
 DocType: Leave Encashment,Encashable days,أيام قابلة للتهيئة
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,لإنشاء مستند مرجع طلب الدفع مطلوب
 DocType: Soil Texture,Sandy Clay,الصلصال الرملي
@@ -7693,6 +7727,7 @@
 DocType: Hotel Room Package,Amenities,وسائل الراحة
 DocType: Accounts Settings,Automatically Fetch Payment Terms,جلب شروط الدفع تلقائيًا
 DocType: QuickBooks Migrator,Undeposited Funds Account,حساب الأموال غير المدعومة
+DocType: Coupon Code,Uses,الاستخدامات
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,لا يسمح بوضع الدفع الافتراضي المتعدد
 DocType: Sales Invoice,Loyalty Points Redemption,نقاط الولاء الفداء
 ,Appointment Analytics,تحليلات الموعد
@@ -7709,6 +7744,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,الميزانية الإجمالية
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,اتركه فارغا إذا جعلت مجموعات الطلاب في السنة
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",إذا تم، المشاركات لا. من أيام عمل وسوف تشمل أيام العطل، وهذا سوف يقلل من قيمة الراتب لكل يوم
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,فشل في اضافة النطاق
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",للسماح بوصول الاستلام / التسليم ، قم بتحديث &quot;الإفراط في الاستلام / بدل التسليم&quot; في إعدادات المخزون أو العنصر.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?",التطبيقات التي تستخدم المفتاح الحالي لن تتمكن من الدخول ، هل انت متأكد ؟
 DocType: Subscription Settings,Prorate,بنسبة كذا
@@ -7721,6 +7757,7 @@
 ,BOM Stock Report,تقرير الأسهم BOM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",إذا لم يكن هناك مهلة زمنية محددة ، فسيتم التعامل مع الاتصالات من قبل هذه المجموعة
 DocType: Stock Reconciliation Item,Quantity Difference,الكمية الفرق
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ دائن
 ,Electronic Invoice Register,تسجيل الفاتورة الإلكترونية
@@ -7974,6 +8011,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),الضرائب والرسوم مقطوعة (عملة الشركة)
 DocType: Item Group,General Settings,الإعدادات العامة
 DocType: Article,Article,مقالة - سلعة
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,الرجاء إدخال رمز القسيمة !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,(من عملة) و (إلى عملة) لا يمكن أن تكون نفسها
 DocType: Taxable Salary Slab,Percent Deduction,خصم في المئة
 DocType: GL Entry,To Rename,لإعادة تسمية
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index ab0fb60..fbb2b0f 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,МАТ-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Клиент - Контакти
 DocType: Shift Type,Enable Auto Attendance,Активиране на автоматично посещение
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,"Моля, въведете Склад и Дата"
 DocType: Lost Reason Detail,Opportunity Lost Reason,Възможност Изгубена причина
 DocType: Patient Appointment,Check availability,Провери наличността
 DocType: Retention Bonus,Bonus Payment Date,Бонус Дата на плащане
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Завършени работни поръчки
 DocType: Support Settings,Forum Posts,Форум Публикации
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Задачата е включена като основна задача. В случай, че има някакъв проблем при обработката във фонов режим, системата ще добави коментар за грешката в това Съгласуване на запасите и ще се върне към етапа на чернова."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",За съжаление валидността на кода на купона не е започнала
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Облагаема сума
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: Leave Policy,Leave Policy Details,Оставете подробности за правилата
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Консумативи
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Клас
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 DocType: Restaurant Table,No of Seats,Брой на седалките
 DocType: Sales Invoice,Overdue and Discounted,Просрочени и намалени
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Обаждането е прекъснато
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Разстоянието между редовете за сумата с думи
 DocType: Vehicle,Additional Details,допълнителни детайли
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Не е зададено описание
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Извличане на артикули от склад
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Заявка за покупка.
 DocType: POS Closing Voucher Details,Collected Amount,Събрана сума
 DocType: Lab Test,Submitted Date,Изпратена дата
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Уча
 ,Trial Balance (Simple),Пробен баланс (прост)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Активиране на отложения разход
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Приложен купонов код
 DocType: Asset,Next Depreciation Date,Следваща дата на амортизация
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Разходите за дейността според Служител
 DocType: Accounts Settings,Settings for Accounts,Настройки за сметки
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Работна поръчка
 DocType: Sales Invoice,Total Qty,Общо Количество
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Идентификационен номер на
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 DocType: Item,Show in Website (Variant),Покажи в уебсайта (вариант)
 DocType: Employee,Health Concerns,Здравни проблеми
 DocType: Payroll Entry,Select Payroll Period,Изберете ТРЗ Период
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Сметка за удържане на данъци
 DocType: Pricing Rule,Sales Partner,Търговски партньор
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Всички оценъчни карти на доставчици.
+DocType: Coupon Code,To be used to get discount,Да се използва за получаване на отстъпка
 DocType: Buying Settings,Purchase Receipt Required,Покупка Квитанция Задължително
 DocType: Sales Invoice,Rail,релса
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Реална цена
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,План за производство
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Отваряне на инструмента за създаване на фактури
 DocType: Salary Component,Round to the Nearest Integer,Завъртете до най-близкия цяло число
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Позволете артикулите, които не са на склад, да бъдат добавени в количката"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Продажби - Връщане
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Задайте количество в транзакции въз основа на сериен № вход
 ,Total Stock Summary,Общо обобщение на наличностите
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базова цена на час (Валута на компанията)
 ,Qty To Be Billed,"Количество, за да бъдете таксувани"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Доставени Сума
+DocType: Coupon Code,Gift Card,Карта за подарък
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,"Количество, запазено за производство: количество суровини за производство на производствени артикули."
 DocType: Loyalty Point Entry Redemption,Redemption Date,Дата на обратно изкупуване
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Тази банкова транзакция вече е напълно съгласувана
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Създайте график
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Фактури за покупка
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Можете да го подновите само ако вашето членство изтече в рамките на 30 дни
 DocType: Shopping Cart Settings,Show Stock Availability,Показване на наличностите в наличност
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Задайте {0} в категория активи {1} или фирма {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Количество, запазено: Количество, поръчано за продажба, но не е доставено."
 DocType: Drug Prescription,Interval UOM,Интервал (мерна единица)
 DocType: Customer,"Reselect, if the chosen address is edited after save","Преименувайте отново, ако избраният адрес се редактира след запазване"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,"Количество, запазено за подизпълнение: Количество суровини за изработване на извадени продукти."
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,"Количество, запазено за подизпълнение: Количество суровини за изработване на извадени продукти."
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 DocType: Item,Hub Publishing Details,Подробна информация за издателя
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',"""Начален баланс"""
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Импортиране на елементи и UOMs
 DocType: Repayment Schedule,Balance Loan Amount,Баланс на заема
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Добавени към подробности
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",За съжаление кодът на талона е изчерпан
 DocType: Communication Medium,Catch All,Хванете всички
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,График на курса
 DocType: Budget,Applicable on Material Request,Приложимо за материално искане
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Невалиден атрибут
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} трябва да бъде изпратено
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Кампании по имейл
+DocType: Sales Partner,To Track inbound purchase,За проследяване на входяща покупка
 DocType: Buying Settings,Default Supplier Group,Група доставчици по подразбиране
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малко или равно на {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Максималната допустима сума за компонента {0} надвишава {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Направете запис на акции
 DocType: Hotel Room Reservation,Hotel Reservation User,Потребителски резервационен хотел
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Задаване на състояние
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране на посещаемостта чрез Настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Моля изберете префикс първо
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 DocType: Contract,Fulfilment Deadline,Краен срок за изпълнение
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Близо до вас
 DocType: Student,O-,О-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,В процес на преразглеждане
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Неуспешно влизане
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Актив {0} е създаден
+DocType: Coupon Code,Promotional,Промоционални
 DocType: Special Test Items,Special Test Items,Специални тестови елементи
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Трябва да сте потребител с роля на системния мениджър и мениджър на елементи, за да се регистрирате на Marketplace."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Основни доклади
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
 DocType: Subscription Plan,Billing Interval Count,Графичен интервал на фактуриране
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Срещи и срещи с пациентите
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Стойността липсва
 DocType: Employee,Department and Grade,Департамент и степен
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Начална и крайна дата
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Условия за изпълнение на Общите условия на договора
 ,Delivered Items To Be Billed,"Доставени изделия, които да се фактурират"
+DocType: Coupon Code,Maximum Use,Максимална употреба
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Складът не може да се променя за Serial No.
 DocType: Authorization Rule,Average Discount,Средна отстъпка
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,Инвентаризация
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Изтеглете като Json
 DocType: Item,Sales Details,Продажби Детайли
+DocType: Coupon Code,Used,Използва се
 DocType: Opportunity,With Items,С артикули
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Кампанията &#39;{0}&#39; вече съществува за {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Екип за поддръжка
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",За актив {0} не е намерен активен ценови списък. Доставката чрез \ сериен номер не може да бъде осигурена
 DocType: Sales Partner,Sales Partner Target,Търговски партньор - Цел
 DocType: Loan Type,Maximum Loan Amount,Максимален Размер на заема
-DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
+DocType: Coupon Code,Pricing Rule,Ценообразуване Правило
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Дублиран номер на ролката за ученик {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Заявка за материал към поръчка за покупка
 DocType: Company,Default Selling Terms,Условия за продажба по подразбиране
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,Сума За Плащане
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Полудневният ден трябва да е между Работата от датата и датата на приключване на работата
 DocType: Healthcare Settings,Healthcare Service Items,Елементи на здравната служба
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Невалиден баркод. Към този баркод няма прикрепен артикул.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Нетна промяна в паричната наличност
 DocType: Assessment Plan,Grading Scale,Оценъчна скала
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Активна сметка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Нова дата на издаване трябва да бъде в бъдеще
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 DocType: Lab Test,Technician Name,Име на техник
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3003,6 +3017,7 @@
 DocType: Products Settings,Hide Variants,Скриване на варианти
 DocType: Lead,Next Contact By,Следваща Контакт с
 DocType: Compensatory Leave Request,Compensatory Leave Request,Искане за компенсаторно напускане
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Не може да се таксува за елемент {0} в ред {1} повече от {2}. За да разрешите надплащането, моля, задайте квота в Настройки на акаунти"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},"Количество, необходимо за елемент {0} на ред {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Склад {0} не може да се изтрие, тъй като съществува количество за артикул {1}"
 DocType: Blanket Order,Order Type,Тип поръчка
@@ -3172,7 +3187,6 @@
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
 DocType: Employee Benefit Claim,Claim Benefit For,Възползвайте се от обезщетението за
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Не може да надхвърля стойността {0} на ред {1} повече от {2}. За да позволите прекалено таксуване, моля, задайте настройките за запас"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Актуализиране на отговора
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
@@ -3462,6 +3476,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,"Моля, посочете валута във фирмата"
 DocType: Workstation,Wages per hour,Заплати на час
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Конфигурирайте {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Склад за баланс в Batch {0} ще стане отрицателна {1} за позиция {2} в склада {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
@@ -3791,6 +3806,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Знаете Заплата Slip
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,На изчакване
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,А ргенирането трябва да има поне една правилна опция
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Поръчки за покупка
 DocType: Account,Inter Company Account,Вътрешна фирмена сметка
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Масов импорт
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
@@ -3801,6 +3817,7 @@
 DocType: POS Profile,[Select],[Избор]
 DocType: Staffing Plan Detail,Number Of Positions,Брой позиции
 DocType: Vital Signs,Blood Pressure (diastolic),Кръвно налягане (диастолично)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,"Моля, изберете клиента."
 DocType: SMS Log,Sent To,Изпратени На
 DocType: Agriculture Task,Holiday Management,Управление на ваканциите
 DocType: Payment Request,Make Sales Invoice,Направи фактурата за продажба
@@ -4010,7 +4027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} не е изпратена
 DocType: Subscription,Trialling,изпробване
 DocType: Sales Invoice Item,Deferred Revenue,Отсрочени приходи
-DocType: Bank Account,GL Account,GL акаунт
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Парична сметка ще се използва за създаване на фактура за продажба
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Освобождаване от подкатегорията
 DocType: Member,Membership Expiry Date,Дата на изтичане на членството
@@ -4414,13 +4430,13 @@
 DocType: C-Form Invoice Detail,Territory,Територия
 DocType: Pricing Rule,Apply Rule On Item Code,Приложете правило за кода на артикула
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Доклад за баланса на акциите
 DocType: Stock Settings,Default Valuation Method,Метод на оценка по подразбиране
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Такса
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Показване на кумулативната сума
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Актуализираното актуализиране. Може да отнеме известно време.
 DocType: Production Plan Item,Produced Qty,Произведен брой
 DocType: Vehicle Log,Fuel Qty,Количество на горивото
-DocType: Stock Entry,Target Warehouse Name,Име на целевия склад
 DocType: Work Order Operation,Planned Start Time,Планиран начален час
 DocType: Course,Assessment,Оценяване
 DocType: Payment Entry Reference,Allocated,Разпределен
@@ -4486,10 +4502,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Стандартни условия, които могат да бъдат добавени към Продажби и покупки. Примери: 1. Валидност на офертата. 1. Условия на плащане (авансово, на кредит, част аванс и т.н.). 1. Какво е допълнително (или платими от клиента). Предупреждение / използване 1. безопасност. 1. Гаранция ако има такива. 1. Връща политика. 1. Условия за корабоплаването, ако е приложимо. 1. начини за разрешаване на спорове, обезщетение, отговорност и др 1. Адрес и контакти на вашата компания."
 DocType: Homepage Section,Section Based On,Раздел Въз основа на
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Показване на прилагане на кода на купона
 DocType: Issue,Issue Type,Тип на издаване
 DocType: Attendance,Leave Type,Тип отсъствие
 DocType: Purchase Invoice,Supplier Invoice Details,Доставчик Данни за фактурата
 DocType: Agriculture Task,Ignore holidays,Пренебрегвайте празниците
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Добавяне / редактиране на условия за талони
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / Разлика сметка ({0}) трябва да бъде партида на &quot;печалбата или загубата&quot;
 DocType: Stock Entry Detail,Stock Entry Child,Дете за влизане в акции
 DocType: Project,Copied From,Копирано от
@@ -4664,6 +4682,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,План за оценка Критерии
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Сделки
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Предотвратяване на поръчки за покупка
+DocType: Coupon Code,Coupon Name,Име на талон
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Податлив
 DocType: Email Campaign,Scheduled,Планиран
 DocType: Shift Type,Working Hours Calculation Based On,Изчисляване на работното време въз основа на
@@ -4680,7 +4699,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Създаване на варианти
 DocType: Vehicle,Diesel,дизел
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Не е избрана валута на ценоразписа
+DocType: Quick Stock Balance,Available Quantity,Налично количество
 DocType: Purchase Invoice,Availed ITC Cess,Наблюдаваше ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 ,Student Monthly Attendance Sheet,Student Месечен Присъствие Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,"Правило за доставка, приложимо само за продажбата"
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата на закупуване
@@ -4747,8 +4768,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
 DocType: Quality Meeting,Quality Meeting,Качествена среща
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-група на група
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 DocType: Employee,ERPNext User,ERPПреводен потребител
+DocType: Coupon Code,Coupon Description,Описание на талона
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Партида е задължителна на ред {0}
 DocType: Company,Default Buying Terms,Условия за покупка по подразбиране
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Покупка Квитанция приложените аксесоари
@@ -4911,6 +4932,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Against Document Detail No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Изтриването не е разрешено за държава {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Тип Компания е задължително
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Приложете купонния код
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",За работна карта {0} можете да направите само запис на запасите от типа „Прехвърляне на материали за производство“
 DocType: Quality Inspection,Outgoing,Изходящ
 DocType: Customer Feedback Table,Customer Feedback Table,Таблица за обратна връзка на клиентите
@@ -5060,7 +5082,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,При подаване на поръчка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Добавете всички доставчици
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Разпределената сума не може да бъде по-голяма от остатъка.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 DocType: Tally Migration,Parties,страни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Разгледай BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Обезпечени кредити
@@ -5092,7 +5113,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не позволявайте да зададете алтернативен елемент за елемента {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Датата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Оторизиран подпис
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Наличен нетен ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Създаване на такси
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
@@ -5117,6 +5137,7 @@
 DocType: Quiz Result,Wrong,погрешно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Скоростта, с която Ценоразпис валута се превръща в основна валута на клиента"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (фирмена валута)
+DocType: Sales Partner,Referral Code,Референтен код
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Общият размер на авансовото плащане не може да бъде по-голям от общия размер на санкцията
 DocType: Salary Slip,Hour Rate,Цена на час
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Активиране на автоматичната повторна поръчка
@@ -5245,6 +5266,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Показване на наличностите
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Нетни парични средства от Текуща дейност
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Ред № {0}: Състоянието трябва да бъде {1} за отстъпка от фактури {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -&gt; {1}) не е намерен за артикул: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Позиция 4
 DocType: Student Admission,Admission End Date,Прием - Крайна дата
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Подизпълнители
@@ -5267,6 +5289,7 @@
 DocType: Travel Request,Fully Sponsored,Напълно спонсориран
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Вписване на обратния дневник
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Създайте Job Card
+DocType: Quotation,Referral Sales Partner,Референтен партньор за продажби
 DocType: Quality Procedure Process,Process Description,Описание на процеса
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Клиент {0} е създаден.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Понастоящем няма налични запаси в нито един склад
@@ -5401,6 +5424,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Курс
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Четене на качен файл
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Спиралата поръчка за работа не може да бъде отменена, първо я отменете, за да я отмените"
+DocType: Coupon Code,Coupon Code,Код на талона
 DocType: Asset,Journal Entry for Scrap,Вестник Влизане за скрап
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,"Моля, дръпнете елементи от Delivery Note"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Ред {0}: изберете работната станция срещу операцията {1}
@@ -5483,6 +5507,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Изисква се „Дата“
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Внос и експорт на данни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",За съжаление валидността на кода на купона е изтекла
 DocType: Bank Account,Account Details,Детайли на сметка
 DocType: Crop,Materials Required,Необходими материали
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Няма намерени студенти
@@ -5520,6 +5545,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Отидете на Потребители
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Платената сума + отписана сума не може да бъде по-голяма от обща сума
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} не е валиден Партиден номер за Артикул {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,"Моля, въведете валиден код на купона !!"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Забележка: Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Task,Task Description,Описание на задачата
 DocType: Training Event,Seminar,семинар
@@ -5783,6 +5809,7 @@
 ,TDS Payable Monthly,Такса за плащане по месеци
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Зареден за замяна на BOM. Това може да отнеме няколко минути.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Общи плащания
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},"Серийни номера, изисквано за серийни номера, т {0}"
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Краен Плащания с фактури
@@ -5872,6 +5899,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Вземи суровини за производство
 DocType: Job Opening,Job Title,Длъжност
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Бъдещо плащане Реф
+DocType: Quotation,Additional Discount and Coupon Code,Допълнителен код за отстъпка и купон
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} показва, че {1} няма да предостави котировка, но са цитирани всички елементи \. Актуализиране на състоянието на котировката на RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Максималните проби - {0} вече са запазени за партида {1} и елемент {2} в партида {3}.
@@ -6099,7 +6127,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Настройки за уебсайт страница
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} е задържан до {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Не са разрешени RFQ за {0} поради наличието на {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Направи фактурата за покупка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Използвани листа
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Използваните талони са {1}. Позволеното количество се изчерпва
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Искате ли да изпратите материалната заявка
 DocType: Job Offer,Awaiting Response,Очаква отговор
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6113,6 +6143,7 @@
 DocType: Training Event Employee,Optional,по избор
 DocType: Salary Slip,Earning & Deduction,Приходи & Удръжки
 DocType: Agriculture Analysis Criteria,Water Analysis,Воден анализ
+DocType: Sales Order,Skip Delivery Note,Пропуснете бележка за доставка
 DocType: Price List,Price Not UOM Dependent,Цена не зависи от UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} вариантите са създадени.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Споразумение за ниво на услуга по подразбиране вече съществува.
@@ -6217,6 +6248,7 @@
 DocType: Vehicle,Last Carbon Check,Последна проверка на въглерода
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Правни разноски
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,"Моля, изберете количество на ред"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Работна поръчка {0}: работна карта не е намерена за операцията {1}
 DocType: Purchase Invoice,Posting Time,Време на осчетоводяване
 DocType: Timesheet,% Amount Billed,% Фактурирана сума
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Разходите за телефония
@@ -6319,7 +6351,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Данъци и такси - Добавени
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата, която е налице за използване"
 ,Sales Funnel,Фуния на продажбите
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Количка
@@ -6414,6 +6445,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Точките на лоялност ще се изчисляват от направеното направено (чрез фактурата за продажби), въз основа на посочения коефициент на събираемост."
 DocType: Program Enrollment Tool,Enroll Students,Прием на студенти
+DocType: Pricing Rule,Coupon Code Based,На базата на кода на купона
 DocType: Company,HRA Settings,HRA Настройки
 DocType: Homepage,Hero Section,Раздел Герой
 DocType: Employee Transfer,Transfer Date,Дата на прехвърляне
@@ -6529,6 +6561,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Моля, поставете фирмения филтър празен, ако Group By е &quot;Company&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Публикуване Дата не може да бъде бъдеща дата
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Пореден № {1} не съвпада с {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте номерацията на сериите за посещаемост чрез Настройка&gt; Серия за номериране"
 DocType: Stock Entry,Target Warehouse Address,Адрес на целевия склад
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Регулярен отпуск
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Времето преди началния час на смяната, през който се приема за напускане на служителите за присъствие."
@@ -6563,7 +6596,6 @@
 DocType: Employee Grade,Employee Grade,Степен на заетост
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Работа заплащана на парче
 DocType: GSTR 3B Report,June,юни
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Share Balance,From No,От №
 DocType: Shift Type,Early Exit Grace Period,Период за ранно излизане от грация
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
@@ -6848,7 +6880,6 @@
 DocType: Warehouse,Warehouse Name,Склад - Име
 DocType: Naming Series,Select Transaction,Изберете транзакция
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -&gt; {1}) не е намерен за елемент: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Споразумение за ниво на услуга с тип субект {0} и субект {1} вече съществува.
 DocType: Journal Entry,Write Off Entry,Въвеждане на отписване
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
@@ -6986,6 +7017,7 @@
 DocType: Budget,Warn,Предупреждавай
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Всички елементи вече са прехвърлени за тази поръчка.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
+DocType: Bank Account,Company Account,Фирмена сметка
 DocType: Asset Maintenance,Manufacturing User,Потребител - производство
 DocType: Purchase Invoice,Raw Materials Supplied,Суровини - доставени
 DocType: Subscription Plan,Payment Plan,Платежен план
@@ -7027,6 +7059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) не може да бъде по-голямо от планираното количество ({2}) в работната поръчка {3}
 DocType: Certification Application,Name of Applicant,Име на кандидата
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Time Sheet за производство.
+DocType: Quick Stock Balance,Quick Stock Balance,Бърз баланс на запасите
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Междинна сума
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Не може да се променят свойствата на Variant след транзакция с акции. Ще трябва да направите нова позиция, за да направите това."
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA мандат
@@ -7353,6 +7386,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},"Моля, задайте {0}"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} е неактивен студент
 DocType: Employee,Health Details,Здравни Детайли
+DocType: Coupon Code,Coupon Type,Тип купон
 DocType: Leave Encashment,Encashable days,Дни за включване
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,"За да създадете референтен документ за искане за плащане, се изисква"
 DocType: Soil Texture,Sandy Clay,Санди Клей
@@ -7635,6 +7669,7 @@
 DocType: Hotel Room Package,Amenities,Удобства
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Автоматично извличане на условията за плащане
 DocType: QuickBooks Migrator,Undeposited Funds Account,Сметка за неплатени средства
+DocType: Coupon Code,Uses,употреби
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Не е разрешен няколко начина на плащане по подразбиране
 DocType: Sales Invoice,Loyalty Points Redemption,Изплащане на точки за лоялност
 ,Appointment Analytics,Анализ за назначаване
@@ -7651,6 +7686,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Общ бюджет
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Оставете празно, ако правите групи ученици на година"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ако е избрано, Total не. на работните дни ще включва празници, а това ще доведе до намаляване на стойността на Заплата на ден"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Неуспешно добавяне на домейн
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","За да разрешите свръх получаване / доставка, актуализирайте &quot;Над получаване / Позволение за доставка&quot; в Настройки на запасите или артикула."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Приложенията, използващи текущия ключ, няма да имат достъп, вярно ли е?"
 DocType: Subscription Settings,Prorate,разпределям пропорционално
@@ -7663,6 +7699,7 @@
 ,BOM Stock Report,BOM Доклад за наличност
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ако няма определен времеви интервал, комуникацията ще се обработва от тази група"
 DocType: Stock Reconciliation Item,Quantity Difference,Количествена разлика
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Opportunity Item,Basic Rate,Основен курс
 DocType: GL Entry,Credit Amount,Кредитна сметка
 ,Electronic Invoice Register,Регистър на електронни фактури
@@ -7916,6 +7953,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Данъци и такси - Удръжки (фирмена валута)
 DocType: Item Group,General Settings,Основни настройки
 DocType: Article,Article,статия
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,"Моля, въведете кода на купона !!"
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,От Валута и да валути не могат да бъдат едни и същи
 DocType: Taxable Salary Slab,Percent Deduction,Процентно отчисление
 DocType: GL Entry,To Rename,За преименуване
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 31be0b4..26a3c33 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,Mat-মোর্চা-.YYYY.-
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
 DocType: Shift Type,Enable Auto Attendance,স্বয়ংক্রিয় উপস্থিতি সক্ষম করুন
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,গুদাম এবং তারিখ প্রবেশ করুন
 DocType: Lost Reason Detail,Opportunity Lost Reason,সুযোগ হারানো কারণ
 DocType: Patient Appointment,Check availability,গ্রহণযোগ্যতা যাচাই
 DocType: Retention Bonus,Bonus Payment Date,বোনাস প্রদানের তারিখ
@@ -263,6 +264,7 @@
 ,Completed Work Orders,সম্পন্ন কাজ আদেশ
 DocType: Support Settings,Forum Posts,ফোরাম পোস্ট
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",কাজটি পটভূমির কাজ হিসাবে সজ্জিত করা হয়েছে। ব্যাকগ্রাউন্ডে প্রক্রিয়াজাতকরণের ক্ষেত্রে যদি কোনও সমস্যা থাকে তবে সিস্টেমটি এই স্টক পুনর্মিলন সংক্রান্ত ত্রুটি সম্পর্কে একটি মন্তব্য যুক্ত করবে এবং খসড়া পর্যায়ে ফিরে যাবে vert
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","দুঃখিত, কুপন কোডের বৈধতা শুরু হয়নি"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,করযোগ্য অর্থ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: Leave Policy,Leave Policy Details,শর্তাবলী |
@@ -327,6 +329,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,বি-
 DocType: Assessment Result,Grade,শ্রেণী
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Restaurant Table,No of Seats,আসন সংখ্যা নেই
 DocType: Sales Invoice,Overdue and Discounted,অতিরিক্ত ও ছাড়যুক্ত
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,কল সংযোগ বিচ্ছিন্ন
@@ -503,6 +506,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,কথায় পরিমাণ জন্য রেখার মধ্যবর্তী স্থান
 DocType: Vehicle,Additional Details,অতিরিক্ত তথ্য
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,দেওয়া কোন বিবরণ
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,গুদাম থেকে আইটেম আনুন
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,কেনার জন্য অনুরোধ জানান.
 DocType: POS Closing Voucher Details,Collected Amount,সংগৃহীত পরিমাণ
 DocType: Lab Test,Submitted Date,জমা দেওয়া তারিখ
@@ -609,6 +613,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,শেখা
 ,Trial Balance (Simple),পরীক্ষার ভারসাম্য (সহজ)
 DocType: Purchase Invoice Item,Enable Deferred Expense,বিলম্বিত ব্যয় সক্রিয় করুন
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,প্রয়োগকৃত কুপন কোড
 DocType: Asset,Next Depreciation Date,পরবর্তী অবচয় তারিখ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,কর্মচারী প্রতি কার্যকলাপ খরচ
 DocType: Accounts Settings,Settings for Accounts,অ্যাকাউন্ট এর জন্য সেটিং
@@ -839,8 +844,6 @@
 DocType: BOM,Work Order,কাজের আদেশ
 DocType: Sales Invoice,Total Qty,মোট Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ইমেইল আইডি
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 DocType: Item,Show in Website (Variant),ওয়েবসাইট দেখান (বৈকল্পিক)
 DocType: Employee,Health Concerns,স্বাস্থ সচেতন
 DocType: Payroll Entry,Select Payroll Period,বেতনের সময়কাল নির্বাচন
@@ -1001,6 +1004,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,কর আটকানোর অ্যাকাউন্ট
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,সমস্ত সরবরাহকারী স্কোরকার্ড
+DocType: Coupon Code,To be used to get discount,ছাড় পেতে ব্যবহার করা
 DocType: Buying Settings,Purchase Receipt Required,কেনার রসিদ প্রয়োজনীয়
 DocType: Sales Invoice,Rail,রেল
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,প্রকৃত দাম
@@ -1049,6 +1053,7 @@
 DocType: Production Plan,Production Plan,উৎপাদন পরিকল্পনা
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ইনভয়েস ক্রিয়েশন টুল খুলছে
 DocType: Salary Component,Round to the Nearest Integer,নিকটতম পূর্ণসংখ্যার রাউন্ড
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,স্টকে থাকা আইটেমগুলিকে কার্টে যুক্ত করার অনুমতি দিন
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,সেলস প্রত্যাবর্তন
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,সিরিয়াল কোন ইনপুটের উপর ভিত্তি করে লেনদেনের পরিমাণ নির্ধারণ করুন
 ,Total Stock Summary,মোট শেয়ার সারাংশ
@@ -1175,6 +1180,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),বেজ কেয়ামত হার (কোম্পানির মুদ্রা)
 ,Qty To Be Billed,কিটি টু বি বিল!
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,বিতরিত পরিমাণ
+DocType: Coupon Code,Gift Card,উপহার কার্ড
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,উত্পাদনের জন্য সংরক্ষিত পরিমাণ: উত্পাদন আইটেমগুলি তৈরির কাঁচামাল পরিমাণ।
 DocType: Loyalty Point Entry Redemption,Redemption Date,রিডমপশন তারিখ
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,এই ব্যাংকের লেনদেন ইতিমধ্যে সম্পূর্ণরূপে মিলিত হয়েছে
@@ -1262,6 +1268,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,টাইমসীট তৈরি করুন
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,চালান চালান
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,আপনার সদস্যপদ 30 দিনের মধ্যে মেয়াদ শেষ হয়ে গেলে আপনি শুধুমাত্র নবায়ন করতে পারেন
 DocType: Shopping Cart Settings,Show Stock Availability,স্টক প্রাপ্যতা দেখান
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},সম্পদ বিভাগ {1} বা কোম্পানী {0} সেট করুন {2}
@@ -1537,7 +1544,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","সংরক্ষিত পরিমাণ: পরিমাণ বিক্রয়ের জন্য অর্ডার করা হয়েছে, তবে বিতরণ করা হয়নি।"
 DocType: Drug Prescription,Interval UOM,অন্তর্বর্তী UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",সংরক্ষণ করার পরে যদি নির্বাচিত ঠিকানাটি সম্পাদনা করা হয় তবে নির্বাচন বাতিল করুন
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,সাবকন্ট্রাক্টের জন্য সংরক্ষিত পরিমাণ: উপকোট্রাক্ট আইটেমগুলি তৈরি করতে কাঁচামাল পরিমাণ।
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,সাবকন্ট্রাক্টের জন্য সংরক্ষিত পরিমাণ: উপকোট্রাক্ট আইটেমগুলি তৈরি করতে কাঁচামাল পরিমাণ।
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Item,Hub Publishing Details,হাব প্রকাশনা বিবরণ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',' শুরু'
@@ -1799,6 +1806,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,আইটেম এবং ইউওএম আমদানি করা হচ্ছে
 DocType: Repayment Schedule,Balance Loan Amount,ব্যালেন্স ঋণের পরিমাণ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,বিস্তারিত যোগ করা হয়েছে
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","দুঃখিত, কুপন কোডটি নিঃশেষ হয়ে গেছে"
 DocType: Communication Medium,Catch All,সমস্ত ধরুন
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,সূচি কোর্স
 DocType: Budget,Applicable on Material Request,উপাদান অনুরোধ প্রযোজ্য
@@ -1966,6 +1974,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,ইমেল প্রচারণা
+DocType: Sales Partner,To Track inbound purchase,অন্তর্মুখী ক্রয় ট্র্যাক করতে
 DocType: Buying Settings,Default Supplier Group,ডিফল্ট সরবরাহকারী গ্রুপ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},{0} উপাত্তের জন্য সর্বোচ্চ পরিমাণ {1} অতিক্রম করে
@@ -2119,7 +2128,6 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,স্টক এন্ট্রি করুন
 DocType: Hotel Room Reservation,Hotel Reservation User,হোটেল রিজার্ভেশন ইউজার
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,স্থিতি সেট করুন
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Contract,Fulfilment Deadline,পূরণের সময়সীমা
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,আপনার কাছাকাছি
@@ -2243,6 +2251,7 @@
 DocType: Quality Meeting Table,Under Review,পর্যালোচনা অধীনে
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,লগ ইনে ব্যর্থ
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,সম্পদ {0} তৈরি করা হয়েছে
+DocType: Coupon Code,Promotional,প্রোমোশনাল
 DocType: Special Test Items,Special Test Items,বিশেষ টেস্ট আইটেম
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,মার্কেটপ্লেসে রেজিস্টার করার জন্য আপনাকে সিস্টেম ম্যানেজার এবং আইটেম ম্যানেজার ভূমিকার সাথে একজন ব্যবহারকারী হওয়া প্রয়োজন।
 apps/erpnext/erpnext/config/buying.py,Key Reports,কী রিপোর্ট
@@ -2280,6 +2289,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,ডক ধরন
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
 DocType: Subscription Plan,Billing Interval Count,বিলিং বিরতি গণনা
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,নিয়োগ এবং রোগীর এনকাউন্টার
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,মূল্য অনুপস্থিত
 DocType: Employee,Department and Grade,বিভাগ এবং গ্রেড
@@ -2379,6 +2390,7 @@
 DocType: Project,Start and End Dates,শুরু এবং তারিখগুলি End
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,চুক্তি টেমপ্লেট পূরণের শর্তাবলী
 ,Delivered Items To Be Billed,বিতরণ আইটেম বিল তৈরি করা
+DocType: Coupon Code,Maximum Use,সর্বাধিক ব্যবহার
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ওপেন BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,ওয়ারহাউস সিরিয়াল নং জন্য পরিবর্তন করা যাবে না
 DocType: Authorization Rule,Average Discount,গড় মূল্য ছাড়ের
@@ -2538,6 +2550,7 @@
 DocType: Item,Inventory,জায়
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,জসন হিসাবে ডাউনলোড করুন
 DocType: Item,Sales Details,বিক্রয় বিবরণ
+DocType: Coupon Code,Used,ব্যবহৃত
 DocType: Opportunity,With Items,জানানোর সঙ্গে
 DocType: Asset Maintenance,Maintenance Team,রক্ষণাবেক্ষণ দল
 DocType: Homepage Section,"Order in which sections should appear. 0 is first, 1 is second and so on.","বিভাগে উপস্থিত হওয়া উচিত অর্ডার। 0 প্রথম হয়, 1 দ্বিতীয় হয় এবং আরও।"
@@ -2664,7 +2677,7 @@
 						Serial No cannot be ensured",আইটেমের জন্য কোনও সক্রিয় BOM পাওয়া যায়নি {0}। \ Serial No দ্বারা ডেলিভারি নিশ্চিত করা যাবে না
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 DocType: Loan Type,Maximum Loan Amount,সর্বোচ্চ ঋণের পরিমাণ
-DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
+DocType: Coupon Code,Pricing Rule,প্রাইসিং রুল
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},শিক্ষার্থীর জন্য ডুপ্লিকেট রোল নম্বর {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 DocType: Company,Default Selling Terms,ডিফল্ট বিক্রয় শর্তাদি
@@ -2741,6 +2754,7 @@
 DocType: Payment Schedule,Payment Amount,পরিশোধিত অর্থ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,কাজের তারিখ এবং কাজের শেষ তারিখের মধ্যে অর্ধ দিবসের তারিখ হওয়া উচিত
 DocType: Healthcare Settings,Healthcare Service Items,স্বাস্থ্যসেবা সেবা আইটেম
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,অবৈধ বারকোড। এই বারকোডের সাথে কোনও আইটেম সংযুক্ত নেই।
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Assessment Plan,Grading Scale,শূন্য স্কেল
@@ -2858,7 +2872,6 @@
 DocType: Share Transfer,Asset Account,সম্পদ অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,নতুন প্রকাশের তারিখটি ভবিষ্যতে হওয়া উচিত
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Lab Test,Technician Name,প্রযুক্তিবিদ নাম
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3135,7 +3148,6 @@
 DocType: Student,Student Mobile Number,শিক্ষার্থীর মোবাইল নম্বর
 DocType: Item,Has Variants,ধরন আছে
 DocType: Employee Benefit Claim,Claim Benefit For,জন্য বেনিফিট দাবি
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} এর চেয়ে বেশি {1} সারিতে আইটেম {0} জন্য ওভারব্রিল করা যাবে না। ওভার-বিলিং করার অনুমতি দেওয়ার জন্য, স্টক সেটিংসে সেট করুন"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,প্রতিক্রিয়া আপডেট করুন
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
@@ -3420,6 +3432,7 @@
 DocType: Vehicle,Fuel Type,জ্বালানীর ধরণ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,কোম্পানি মুদ্রা উল্লেখ করুন
 DocType: Workstation,Wages per hour,প্রতি ঘন্টায় মজুরী
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,উপাদান অনুরোধ নিম্নলিখিত আইটেম এর পুনরায় আদেশ স্তরের উপর ভিত্তি করে স্বয়ংক্রিয়ভাবে উত্থাপিত হয়েছে
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
@@ -3749,6 +3762,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,বেতন স্লিপ জমা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,স্হগিত
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,একটি দণ্ডে কমপক্ষে একটি সঠিক বিকল্প থাকতে হবে
+apps/erpnext/erpnext/hooks.py,Purchase Orders,ক্রয় আদেশ
 DocType: Account,Inter Company Account,ইন্টার কোম্পানি অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,বাল্ক মধ্যে আমদানি
 DocType: Sales Partner,Address & Contacts,ঠিকানা ও যোগাযোগ
@@ -3759,6 +3773,7 @@
 DocType: POS Profile,[Select],[নির্বাচন]
 DocType: Staffing Plan Detail,Number Of Positions,অবস্থানের সংখ্যা
 DocType: Vital Signs,Blood Pressure (diastolic),রক্তচাপ (ডায়স্টোলিক)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,দয়া করে গ্রাহক নির্বাচন করুন।
 DocType: SMS Log,Sent To,প্রেরিত
 DocType: Agriculture Task,Holiday Management,হলিডে ম্যানেজমেন্ট
 DocType: Payment Request,Make Sales Invoice,বিক্রয় চালান করুন
@@ -3965,7 +3980,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 DocType: Subscription,Trialling,trialling
 DocType: Sales Invoice Item,Deferred Revenue,বিলম্বিত রাজস্ব
-DocType: Bank Account,GL Account,জিএল অ্যাকাউন্ট
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,ক্যাশ অ্যাকাউন্ট সেলস ইনভয়েস নির্মাণের জন্য ব্যবহার করা হবে
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,অব্যাহতি উপ বিভাগ
 DocType: Member,Membership Expiry Date,সদস্যপদ মেয়াদ শেষের তারিখ
@@ -4364,13 +4378,13 @@
 DocType: C-Form Invoice Detail,Territory,এলাকা
 DocType: Pricing Rule,Apply Rule On Item Code,আইটেম কোডে বিধি প্রয়োগ করুন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,স্টক ব্যালেন্স রিপোর্ট
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,ফী
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,সংখ্যার পরিমাণ দেখান
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,অগ্রগতি আপডেট. এটি একটি সময় নিতে পারে.
 DocType: Production Plan Item,Produced Qty,উত্পাদিত পরিমাণ
 DocType: Vehicle Log,Fuel Qty,জ্বালানীর Qty
-DocType: Stock Entry,Target Warehouse Name,লক্ষ্য গুদাম নাম
 DocType: Work Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
 DocType: Course,Assessment,অ্যাসেসমেন্ট
 DocType: Payment Entry Reference,Allocated,বরাদ্দ
@@ -4436,10 +4450,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","স্ট্যান্ডার্ড শর্তাবলী এবং বিক্রয় এবং ক্রয় যোগ করা যেতে পারে যে শর্তাবলী. উদাহরণ: প্রস্তাব 1. বৈধতা. 1. অর্থপ্রদান শর্তাদি (ক্রেডিট অগ্রিম, অংশ অগ্রিম ইত্যাদি). 1. অতিরিক্ত (বা গ্রাহকের দ্বারা প্রদেয়) কি. 1. নিরাপত্তা / ব্যবহার সতর্কবাণী. 1. পাটা কোন তাহলে. 1. আয় নীতি. শিপিং 1. শর্তাবলী, যদি প্রযোজ্য হয়. বিরোধ অ্যাড্রেসিং, ক্ষতিপূরণ, দায় 1. উপায়, ইত্যাদি 1. ঠিকানা এবং আপনার কোম্পানীর সাথে যোগাযোগ করুন."
 DocType: Homepage Section,Section Based On,বিভাগ উপর ভিত্তি করে
+DocType: Shopping Cart Settings,Show Apply Coupon Code,আবেদন কুপন কোড দেখান
 DocType: Issue,Issue Type,ইস্যু প্রকার
 DocType: Attendance,Leave Type,ছুটি টাইপ
 DocType: Purchase Invoice,Supplier Invoice Details,সরবরাহকারী চালানের বিশদ বিবরণ
 DocType: Agriculture Task,Ignore holidays,ছুটির দিন উপেক্ষা করুন
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,কুপন শর্তাদি যুক্ত / সম্পাদনা করুন
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ব্যয় / পার্থক্য অ্যাকাউন্ট ({0}) একটি &#39;লাভ বা ক্ষতি&#39; অ্যাকাউন্ট থাকতে হবে
 DocType: Stock Entry Detail,Stock Entry Child,স্টক এন্ট্রি চাইল্ড
 DocType: Project,Copied From,থেকে অনুলিপি
@@ -4610,6 +4626,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,অ্যাসেসমেন্ট পরিকল্পনা নির্ণায়ক
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,লেনদেন
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ক্রয় আদেশ আটকান
+DocType: Coupon Code,Coupon Name,কুপন নাম
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,সমর্থ
 DocType: Email Campaign,Scheduled,তালিকাভুক্ত
 DocType: Shift Type,Working Hours Calculation Based On,ওয়ার্কিং আওয়ারস গণনা ভিত্তিক
@@ -4626,7 +4643,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,ধরন তৈরি
 DocType: Vehicle,Diesel,ডীজ়ল্
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,মূল্য তালিকা মুদ্রা একক নির্বাচন করবেন
+DocType: Quick Stock Balance,Available Quantity,উপলব্ধ পরিমাণ
 DocType: Purchase Invoice,Availed ITC Cess,এজিড আইটিসি সেস
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষামূলক সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন up
 ,Student Monthly Attendance Sheet,শিক্ষার্থীর মাসের এ্যাটেনডেন্স পত্রক
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,শপিং শাসন কেবল বিক্রয় জন্য প্রযোজ্য
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,হ্রাস সারি {0}: পরবর্তী দাম্পত্য তারিখ ক্রয় তারিখ আগে হতে পারে না
@@ -4694,6 +4713,7 @@
 DocType: Quality Meeting,Quality Meeting,মান সভা
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,অ গ্রুপ গ্রুপ
 DocType: Employee,ERPNext User,ERPNext ব্যবহারকারী
+DocType: Coupon Code,Coupon Description,কুপন বর্ণনা
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},ব্যাচ সারিতে বাধ্যতামূলক {0}
 DocType: Company,Default Buying Terms,ডিফল্ট কেনার শর্তাদি
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,কেনার রসিদ আইটেম সরবরাহ
@@ -4855,6 +4875,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,ডকুমেন্ট বিস্তারিত বিরুদ্ধে কোন
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},দেশের জন্য অপসারণের অনুমতি নেই {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,পার্টির প্রকার বাধ্যতামূলক
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,কুপন কোড প্রয়োগ করুন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","জব কার্ড {0} এর জন্য, আপনি কেবলমাত্র &#39;ম্যাটেরিয়াল ট্রান্সফার ফর ম্যানুফ্যাকচারিং&#39; টাইপ স্টক এন্ট্রি করতে পারেন"
 DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Customer Feedback Table,Customer Feedback Table,গ্রাহক প্রতিক্রিয়া সারণী
@@ -5003,7 +5024,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ক্রয় আদেশ জমা দেওয়ার সময়
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,সমস্ত সরবরাহকারী যোগ করুন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,সারি # {0}: বরাদ্দ বকেয়া পরিমাণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না।
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 DocType: Tally Migration,Parties,দল
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,নিরাপদ ঋণ
@@ -5035,7 +5055,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},আইটেম জন্য বিকল্প আইটেম সেট করতে অনুমতি দেয় না {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,দয়া করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),নেট আইটিসি উপলব্ধ (এ) - (খ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ফি তৈরি করুন
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
@@ -5060,6 +5079,7 @@
 DocType: Quiz Result,Wrong,ভুল
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,হারে যা মূল্যতালিকা মুদ্রার এ গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
+DocType: Sales Partner,Referral Code,রেফারেল কোড
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,মোট অগ্রিম পরিমাণ মোট অনুমোদিত পরিমাণের চেয়ে বেশি হতে পারে না
 DocType: Salary Slip,Hour Rate,ঘন্টা হার
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,অটো রি-অর্ডার সক্ষম করুন
@@ -5186,6 +5206,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},আইটেম {0} বিরুদ্ধে BOM নির্বাচন করুন
 DocType: Shopping Cart Settings,Show Stock Quantity,স্টক পরিমাণ দেখান
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,অপারেশন থেকে নিট ক্যাশ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,আইটেম 4
 DocType: Student Admission,Admission End Date,ভর্তি শেষ তারিখ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,সাব-কন্ট্রাক্ট
@@ -5208,6 +5229,7 @@
 DocType: Travel Request,Fully Sponsored,সম্পূর্ণ স্পনসর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,বিপরীত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,জব কার্ড তৈরি করুন
+DocType: Quotation,Referral Sales Partner,রেফারেল বিক্রয় অংশীদার
 DocType: Quality Procedure Process,Process Description,প্রক্রিয়া বর্ণনা
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,গ্রাহক {0} তৈরি করা হয়।
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,বর্তমানে কোন গুদামে পন্য উপলব্ধ নেই
@@ -5246,6 +5268,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,কোম্পানির নাম একই নয়
 DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party is mandatory,পার্টির বাধ্যতামূলক
+apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please set account heads in GST Settings for Compnay {0},অনুগ্রহপূর্বক জিএসটি সেটিংসে অ্যাকাউন্ট প্রধান সেট করুন {0}
 DocType: Course Topic,Topic Name,টপিক নাম
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Please set default template for Leave Approval Notification in HR Settings.,এইচআর সেটিংস এ অনুমোদন বিজ্ঞপ্তি বরখাস্ত করতে ডিফল্ট টেমপ্লেট সেট করুন।
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
@@ -5339,6 +5362,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM হার
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,আপলোড করা ফাইল পড়া
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","বন্ধ করা অর্ডারের অর্ডার বাতিল করা যাবে না, বাতিল করার জন্য এটি প্রথম থেকে বন্ধ করুন"
+DocType: Coupon Code,Coupon Code,কুপন কোড
 DocType: Asset,Journal Entry for Scrap,স্ক্র্যাপ জন্য জার্নাল এন্ট্রি
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,হুণ্ডি থেকে আইটেম টান অনুগ্রহ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},সারি {0}: অপারেশন {1} বিরুদ্ধে ওয়ার্কস্টেশন নির্বাচন করুন
@@ -5419,6 +5443,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;তারিখ&#39; প্রয়োজন
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,ডেটা আমদানি ও রপ্তানি
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","দুঃখিত, কুপন কোডের মেয়াদ শেষ হয়ে গেছে"
 DocType: Bank Account,Account Details,বিস্তারিত হিসাব
 DocType: Crop,Materials Required,সামগ্রী প্রয়োজনীয়
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,কোন ছাত্র পাওয়া
@@ -5456,6 +5481,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,ব্যবহারকারীদের কাছে যান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,প্রদত্ত পরিমাণ পরিমাণ সর্বমোট তার চেয়ে অনেক বেশী হতে পারে না বন্ধ লিখুন + +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} আইটেম জন্য একটি বৈধ ব্যাচ নম্বর নয় {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,বৈধ কুপন কোড প্রবেশ করুন!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},উল্লেখ্য: ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Task,Task Description,কার্য বিবরণী
 DocType: Training Event,Seminar,সেমিনার
@@ -5717,6 +5743,7 @@
 ,TDS Payable Monthly,টিডিএস মাসিক মাসিক
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,BOM প্রতিস্থাপন জন্য সারিবদ্ধ এটি কয়েক মিনিট সময় নিতে পারে।
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,মোট পেমেন্টস
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},ধারাবাহিকভাবে আইটেম জন্য সিরিয়াল আমরা প্রয়োজনীয় {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
@@ -5804,6 +5831,7 @@
 DocType: Production Plan,Get Raw Materials For Production,উত্পাদনের জন্য কাঁচামাল পান
 DocType: Job Opening,Job Title,কাজের শিরোনাম
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,ভবিষ্যতের পেমেন্ট রেফ
+DocType: Quotation,Additional Discount and Coupon Code,অতিরিক্ত ছাড় এবং কুপন কোড
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} ইঙ্গিত দেয় যে {1} একটি উদ্ধৃতি প্রদান করবে না, কিন্তু সমস্ত আইটেম উদ্ধৃত করা হয়েছে। আরএফকিউ কোট অবস্থা স্থির করা"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,সর্বাধিক নমুনা - {0} ইতিমধ্যে ব্যাচ {1} এবং আইটেম {2} ব্যাচ {3} এর জন্য সংরক্ষিত হয়েছে।
@@ -6027,6 +6055,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,ওয়েবসাইট হোমপেজে জন্য সেটিংস
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{1} পর্যন্ত {1} ধরে রাখা হয়
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} এর স্কোরকার্ড স্থানের কারণে {0} জন্য RFQs অনুমোদিত নয়
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,ক্রয় চালান করুন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,ব্যবহৃত পাখি
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,আপনি কি উপাদান অনুরোধ জমা দিতে চান?
 DocType: Job Offer,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
@@ -6041,6 +6070,7 @@
 DocType: Training Event Employee,Optional,ঐচ্ছিক
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 DocType: Agriculture Analysis Criteria,Water Analysis,জল বিশ্লেষণ
+DocType: Sales Order,Skip Delivery Note,ডেলিভারি নোট এড়িয়ে যান
 DocType: Price List,Price Not UOM Dependent,মূল্য ইউওএম নির্ভর নয়
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} বৈকল্পিক তৈরি করা হয়েছে।
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,একটি ডিফল্ট পরিষেবা স্তর চুক্তি ইতিমধ্যে বিদ্যমান।
@@ -6144,6 +6174,7 @@
 DocType: Vehicle,Last Carbon Check,সর্বশেষ কার্বন চেক
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,আইনি খরচ
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,দয়া করে সারিতে পরিমাণ নির্বাচন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},কাজের আদেশ {0}: কাজের জন্য কার্ড খুঁজে পাওয়া যায় নি {1}
 DocType: Purchase Invoice,Posting Time,পোস্টিং সময়
 DocType: Timesheet,% Amount Billed,% পরিমাণ চালান করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,টেলিফোন খরচ
@@ -6244,7 +6275,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,কর ও চার্জ যোগ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,হ্রাস সারি {0}: পরবর্তী অবচয় তারিখটি আগে উপলব্ধ নাও হতে পারে ব্যবহারের জন্য তারিখ
 ,Sales Funnel,বিক্রয় ফানেল
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,কার্ট
@@ -6338,6 +6368,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","আনুগত্য পয়েন্টগুলি খরচ করা হবে (বিক্রয় চালান মাধ্যমে), সংগ্রহ ফ্যাক্টর উপর ভিত্তি করে উল্লিখিত।"
 DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
+DocType: Pricing Rule,Coupon Code Based,কুপন কোড ভিত্তিক
 DocType: Company,HRA Settings,এইচআরএ সেটিংস
 DocType: Homepage,Hero Section,হিরো বিভাগ
 DocType: Employee Transfer,Transfer Date,তারিখ স্থানান্তর
@@ -6451,6 +6482,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',দয়া করে কোম্পানির ফাঁকা ফিল্টার সেট করুন যদি একদল &#39;কোম্পানি&#39; হল
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,পোস্টিং তারিখ ভবিষ্যতে তারিখে হতে পারে না
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},সারি # {0}: সিরিয়াল কোন {1} সঙ্গে মেলে না {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 DocType: Stock Entry,Target Warehouse Address,লক্ষ্য গুদাম ঠিকানা
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,নৈমিত্তিক ছুটি
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,শিফট শুরুর আগে যে সময়টিতে কর্মচারী চেক-ইন উপস্থিতির জন্য বিবেচিত হয়।
@@ -6485,7 +6517,6 @@
 DocType: Employee Grade,Employee Grade,কর্মচারী গ্রেড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ফুরণ
 DocType: GSTR 3B Report,June,জুন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Share Balance,From No,না থেকে
 DocType: Shift Type,Early Exit Grace Period,প্রারম্ভিক প্রস্থান গ্রেস পিরিয়ড
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
@@ -6768,7 +6799,6 @@
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ভূমিকা অনুমোদন বা ব্যবহারকারী অনুমদন লিখুন দয়া করে
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 DocType: Journal Entry,Write Off Entry,এন্ট্রি বন্ধ লিখুন
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","যদি সক্রিয় থাকে, তাহলে প্রোগ্রাম এনরোলমেন্ট টুল এ ক্ষেত্রটি একাডেমিক টার্ম বাধ্যতামূলক হবে।"
@@ -6904,6 +6934,7 @@
 DocType: Budget,Warn,সতর্ক করো
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,এই ওয়ার্ক অর্ডারের জন্য সমস্ত আইটেম ইতিমধ্যে স্থানান্তর করা হয়েছে।
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
+DocType: Bank Account,Company Account,কোম্পানির অ্যাকাউন্ট
 DocType: Asset Maintenance,Manufacturing User,উৎপাদন ব্যবহারকারী
 DocType: Purchase Invoice,Raw Materials Supplied,কাঁচামালের সরবরাহ
 DocType: Subscription Plan,Payment Plan,পরিশোধের পরিকল্পনা
@@ -6945,6 +6976,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) কর্ম আদেশ {3} থেকে পরিকল্পিত পরিমাণ ({2}) এর চেয়ে বড় হতে পারে না
 DocType: Certification Application,Name of Applicant,আবেদনকারীর নাম
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,উত্পাদন জন্য টাইম শিট.
+DocType: Quick Stock Balance,Quick Stock Balance,দ্রুত স্টক ব্যালেন্স
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,উপমোট
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,স্টক লেনদেনের পরে বৈকল্পিক বৈশিষ্ট্য পরিবর্তন করা যাবে না। আপনি এটি করতে একটি নতুন আইটেম করতে হবে।
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA আদেশ
@@ -7268,6 +7300,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},সেট করুন {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র-ছাত্রী
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
+DocType: Coupon Code,Coupon Type,কুপন প্রকার
 DocType: Leave Encashment,Encashable days,এনক্যাশেবল দিন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,একটি পেমেন্ট অনুরোধ রেফারেন্স ডকুমেন্ট প্রয়োজন বোধ করা হয় তৈরি করতে
 DocType: Soil Texture,Sandy Clay,স্যান্ডী ক্লে
@@ -7548,6 +7581,7 @@
 DocType: Hotel Room Package,Amenities,সুযোগ-সুবিধা
 DocType: Accounts Settings,Automatically Fetch Payment Terms,স্বয়ংক্রিয়ভাবে প্রদানের শর্তাদি আনুন
 DocType: QuickBooks Migrator,Undeposited Funds Account,Undeposited তহবিল অ্যাকাউন্ট
+DocType: Coupon Code,Uses,ব্যবহারসমূহ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,পেমেন্ট একাধিক ডিফল্ট মোড অনুমতি দেওয়া হয় না
 DocType: Sales Invoice,Loyalty Points Redemption,আনুগত্য পয়েন্ট রিডমপশন
 ,Appointment Analytics,নিয়োগের বিশ্লেষণ
@@ -7564,6 +7598,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,মোট বাজেট
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,ফাঁকা ছেড়ে দিন যদি আপনি প্রতি বছরে শিক্ষার্থীদের গ্রুপ করা
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","চেক করা থাকলে, মোট কোন. কার্যদিবসের ছুটির অন্তর্ভুক্ত করা হবে, এবং এই বেতন প্রতি দিন মূল্য কমাতে হবে"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,ডোমেন যুক্ত করতে ব্যর্থ
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","প্রাপ্তি / বিতরণকে অনুমতি দেওয়ার জন্য, স্টক সেটিংস বা আইটেমটিতে &quot;ওভার রসিদ / বিতরণ ভাতা&quot; আপডেট করুন।"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","বর্তমান কী ব্যবহার করে অ্যাপস অ্যাক্সেস করতে পারবে না, আপনি কি নিশ্চিত?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7576,6 +7611,7 @@
 ,BOM Stock Report,BOM স্টক রিপোর্ট
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",যদি কোনও নির্ধারিত টাইমলট না থাকে তবে যোগাযোগটি এই গোষ্ঠী দ্বারা পরিচালিত হবে
 DocType: Stock Reconciliation Item,Quantity Difference,পরিমাণ পার্থক্য
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 ,Electronic Invoice Register,বৈদ্যুতিন চালান নিবন্ধ
@@ -7828,6 +7864,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),কর ও শুল্ক বাদ (কোম্পানি একক)
 DocType: Item Group,General Settings,সাধারণ বিন্যাস
 DocType: Article,Article,প্রবন্ধ
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,কুপন কোড প্রবেশ করুন!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,মুদ্রা থেকে এবং মুদ্রার একই হতে পারে না
 DocType: Taxable Salary Slab,Percent Deduction,শতকরা হার
 DocType: GL Entry,To Rename,নতুন নামকরণ
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 4f2eb73..aa148cb 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY.-
 DocType: Purchase Order,Customer Contact,Kontakt kupca
 DocType: Shift Type,Enable Auto Attendance,Omogući automatsko prisustvo
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Unesite skladište i datum
 DocType: Lost Reason Detail,Opportunity Lost Reason,Prilika izgubljen razlog
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Retention Bonus,Bonus Payment Date,Datum isplate bonusa
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Završene radne naloge
 DocType: Support Settings,Forum Posts,Forum Posts
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Zadatak je zamišljen kao pozadinski posao. U slučaju da u pozadini postoji problem s obradom, sistem će dodati komentar o grešci u ovom usklađivanju dionica i vratiti se u fazu skica"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Nažalost, valjanost koda kupona nije započela"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,oporezivi iznos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: Leave Policy,Leave Policy Details,Ostavite detalje o politici
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Potrošni
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,razred
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Restaurant Table,No of Seats,Broj sedišta
 DocType: Sales Invoice,Overdue and Discounted,Zakašnjeli i sniženi
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Poziv prekinuti
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,Dodatni Detalji
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Nema opisa dano
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Dohvaćanje predmeta iz skladišta
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Zahtjev za kupnju.
 DocType: POS Closing Voucher Details,Collected Amount,Prikupljeni iznos
 DocType: Lab Test,Submitted Date,Datum podnošenja
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Učiti
 ,Trial Balance (Simple),Probni balans (jednostavan)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Omogućite odloženi trošak
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Primenjeni kod kupona
 DocType: Asset,Next Depreciation Date,Sljedeća Amortizacija Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktivnost Trošak po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Radni nalog
 DocType: Sales Invoice,Total Qty,Ukupno Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Item,Show in Website (Variant),Pokaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Payroll Entry,Select Payroll Period,Odaberite perioda isplate
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Porez na odbitak
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Sve ispostavne kartice.
+DocType: Coupon Code,To be used to get discount,Da biste iskoristili popust
 DocType: Buying Settings,Purchase Receipt Required,Kupnja Potvrda Obvezno
 DocType: Sales Invoice,Rail,Rail
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Stvarni trošak
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Plan proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvaranje alata za kreiranje fakture
 DocType: Salary Component,Round to the Nearest Integer,Zaokružite na najbliži cijeli broj
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Dopustite da se dodaju u košaricu artikli koji nisu na zalihama
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Povrat robe
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Postavite količinu u transakcijama na osnovu Serijski broj ulaza
 ,Total Stock Summary,Ukupno Stock Pregled
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company Valuta)
 ,Qty To Be Billed,Količina za naplatu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Isporučena Iznos
+DocType: Coupon Code,Gift Card,Poklon kartica
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Količina rezervirane za proizvodnju: Količina sirovina za izradu proizvodnih predmeta.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum otkupljenja
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Ova je bankarska transakcija već u potpunosti usklađena
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Napravite Timesheet
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Račun {0} je ušao više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Računi za kupovinu
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Možete obnoviti samo ako vaše članstvo istekne u roku od 30 dana
 DocType: Shopping Cart Settings,Show Stock Availability,Show Stock Availability
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji aktive {1} ili kompaniju {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervirano Količina : Količina naručiti za prodaju , ali nije dostavljena ."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Ponovo odaberite, ako je izabrana adresa uređena nakon čuvanja"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Količina rezervisanog za podugovor: Količina sirovina za izradu predmeta koji se oduzimaju.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Količina rezervisanog za podugovor: Količina sirovina za izradu predmeta koji se oduzimaju.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 DocType: Item,Hub Publishing Details,Detalji izdavanja stanice
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Otvaranje&#39;
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Uvoz predmeta i UOM-ova
 DocType: Repayment Schedule,Balance Loan Amount,Balance Iznos kredita
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Dodato na detalje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Izvinite, kod kupona je iscrpljen"
 DocType: Communication Medium,Catch All,Catch All
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Raspored predmeta
 DocType: Budget,Applicable on Material Request,Primenljivo na zahtev za materijal
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Invalid Atributi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Kampanja e-pošte
+DocType: Sales Partner,To Track inbound purchase,Da biste pratili ulaznu kupovinu
 DocType: Buying Settings,Default Supplier Group,Podrazumevana grupa dobavljača
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Maksimalni iznos koji odgovara komponenti {0} prelazi {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Unesite zalihe
 DocType: Hotel Room Reservation,Hotel Reservation User,Rezervacija korisnika hotela
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Postavite status
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; Serija numeriranja
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; Imenovanje serije
 DocType: Contract,Fulfilment Deadline,Rok ispunjenja
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,U vašoj blizini
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,U pregledu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Neuspešno se prijaviti
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Sredstvo {0} kreirano
+DocType: Coupon Code,Promotional,Promotivni
 DocType: Special Test Items,Special Test Items,Specijalne testne jedinice
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Potrebno je da budete korisnik sa ulogama System Manager i Item Manager za prijavljivanje na Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Ključni izvještaji
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc tip
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
 DocType: Subscription Plan,Billing Interval Count,Interval broja obračuna
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Imenovanja i susreti sa pacijentom
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Nedostaje vrijednost
 DocType: Employee,Department and Grade,Odeljenje i razred
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Datume početka i završetka
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Uslovi ispunjavanja obrasca ugovora
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
+DocType: Coupon Code,Maximum Use,Maksimalna upotreba
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Otvorena BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
@@ -2585,6 +2598,7 @@
 DocType: Item,Inventory,Inventar
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Preuzmi kao Json
 DocType: Item,Sales Details,Prodajni detalji
+DocType: Coupon Code,Used,Rabljeni
 DocType: Opportunity,With Items,Sa stavkama
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampanja &#39;{0}&#39; već postoji za {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Tim za održavanje
@@ -2714,7 +2728,7 @@
 						Serial No cannot be ensured",Nije pronađena aktivna BOM za stavku {0}. Ne može se osigurati isporuka sa \ Serial No.
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
-DocType: Pricing Rule,Pricing Rule,cijene Pravilo
+DocType: Coupon Code,Pricing Rule,cijene Pravilo
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplikat broj roll za studentske {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 DocType: Company,Default Selling Terms,Uobičajeni prodajni uslovi
@@ -2793,6 +2807,7 @@
 DocType: Payment Schedule,Payment Amount,Plaćanje Iznos
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Datum poluvremena treba da bude između rada od datuma i datuma rada
 DocType: Healthcare Settings,Healthcare Service Items,Stavke zdravstvene zaštite
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Nevažeći barkod. Nijedna stavka nije priložena ovom barkodu.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,Pravilo Scale
@@ -2912,7 +2927,6 @@
 DocType: Share Transfer,Asset Account,Račun imovine
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Novi datum izlaska trebao bi biti u budućnosti
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Lab Test,Technician Name,Ime tehničara
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3023,6 +3037,7 @@
 DocType: Products Settings,Hide Variants,Sakrij varijante
 DocType: Lead,Next Contact By,Sledeci put kontaktirace ga
 DocType: Compensatory Leave Request,Compensatory Leave Request,Kompenzacijski zahtev za odlazak
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Ne mogu se preplatiti za stavku {0} u redu {1} više od {2}. Da biste omogućili prekomerno naplaćivanje, molimo postavite dodatak u Postavkama računa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Količina potrebna za točke {0} je u redu {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima artikal {1}
 DocType: Blanket Order,Order Type,Vrsta narudžbe
@@ -3191,7 +3206,6 @@
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
 DocType: Employee Benefit Claim,Claim Benefit For,Claim Benefit For
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne mogu preoptereti za stavku {0} u redu {1} više od {2}. Da biste omogućili prekomerno obračunavanje, molimo vas postavite u postavke zaliha"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Update Response
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3482,6 +3496,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Navedite valuta u Company
 DocType: Workstation,Wages per hour,Plaće po satu
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurišite {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock balans u Batch {0} će postati negativan {1} {2} za tačka na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Nakon materijala Zahtjevi su automatski podignuta na osnovu nivou ponovnog reda stavke
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
@@ -3811,6 +3826,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Slanje plaće Slip
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Na čekanju
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Qurance mora imati najmanje jednu ispravnu opciju
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Narudžbenice
 DocType: Account,Inter Company Account,Inter Company Account
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Uvoz u rinfuzi
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
@@ -3821,6 +3837,7 @@
 DocType: POS Profile,[Select],[ izaberite ]
 DocType: Staffing Plan Detail,Number Of Positions,Broj pozicija
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni pritisak (dijastolni)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Molimo odaberite kupca.
 DocType: SMS Log,Sent To,Poslati
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Ostvariti prodaju fakturu
@@ -4029,7 +4046,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} nije proslijedjen
 DocType: Subscription,Trialling,Trialling
 DocType: Sales Invoice Item,Deferred Revenue,Odloženi prihodi
-DocType: Bank Account,GL Account,GL račun
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Gotovinski račun će se koristiti za kreiranje prodajne fakture
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Izuzetna podkategorija
 DocType: Member,Membership Expiry Date,Datum isteka članstva
@@ -4453,13 +4469,13 @@
 DocType: C-Form Invoice Detail,Territory,Regija
 DocType: Pricing Rule,Apply Rule On Item Code,Primijenite pravilo na kod predmeta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Izvještaj o stanju zaliha
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,provizija
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Prikaži kumulativni iznos
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ažuriranje je u toku. Možda će potrajati neko vrijeme.
 DocType: Production Plan Item,Produced Qty,Proizveden količina
 DocType: Vehicle Log,Fuel Qty,gorivo Količina
-DocType: Stock Entry,Target Warehouse Name,Ime ciljne magacine
 DocType: Work Order Operation,Planned Start Time,Planirani Start Time
 DocType: Course,Assessment,procjena
 DocType: Payment Entry Reference,Allocated,Izdvojena
@@ -4537,10 +4553,12 @@
  1. Načini adresiranja sporova, naknadu štete, odgovornosti, itd 
  1. Adresu i kontakt vaše kompanije."
 DocType: Homepage Section,Section Based On,Odeljak na osnovu
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Prikaži Primjeni kod kupona
 DocType: Issue,Issue Type,Vrsta izdanja
 DocType: Attendance,Leave Type,Ostavite Vid
 DocType: Purchase Invoice,Supplier Invoice Details,Dobavljač Račun Detalji
 DocType: Agriculture Task,Ignore holidays,Ignoriši praznike
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Dodavanje / uređivanje uvjeta kupona
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 DocType: Stock Entry Detail,Stock Entry Child,Dijete ulaska na zalihe
 DocType: Project,Copied From,kopira iz
@@ -4715,6 +4733,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteriji Plan Procjena
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transakcije
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Sprečite kupovne naloge
+DocType: Coupon Code,Coupon Name,Naziv kupona
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Podložno
 DocType: Email Campaign,Scheduled,Planirano
 DocType: Shift Type,Working Hours Calculation Based On,Proračun radnog vremena na osnovu
@@ -4731,7 +4750,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Kreirajte Varijante
 DocType: Vehicle,Diesel,dizel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Cjenik valuta ne bira
+DocType: Quick Stock Balance,Available Quantity,Dostupna količina
 DocType: Purchase Invoice,Availed ITC Cess,Iskoristio ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 ,Student Monthly Attendance Sheet,Student Mjesečni Posjeta list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Pravilo o isporuci primenjuje se samo za prodaju
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma kupovine
@@ -4798,8 +4819,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
 DocType: Quality Meeting,Quality Meeting,Sastanak kvaliteta
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-grupe do grupe
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; Imenovanje serije
 DocType: Employee,ERPNext User,ERPNext User
+DocType: Coupon Code,Coupon Description,Opis kupona
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Serija je obavezno u nizu {0}
 DocType: Company,Default Buying Terms,Uvjeti kupnje
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kupnja Prijem artikla Isporuka
@@ -4962,6 +4983,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Brisanje nije dozvoljeno za zemlju {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Party Tip je obavezno
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Primijenite kupon kod
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Za radnu karticu {0} možete izvršiti samo unos tipa „Prijenos materijala za proizvodnju“
 DocType: Quality Inspection,Outgoing,Društven
 DocType: Customer Feedback Table,Customer Feedback Table,Tabela povratnih informacija korisnika
@@ -5111,7 +5133,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Prilikom narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodajte sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: dodijeljeni iznos ne može biti veći od preostalog iznosa.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 DocType: Tally Migration,Parties,Stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,osigurani krediti
@@ -5143,7 +5164,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne dozvolite postavljanje alternativne stavke za stavku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Neto dostupan ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Kreiraj naknade
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
@@ -5168,6 +5188,7 @@
 DocType: Quiz Result,Wrong,Pogrešno
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Company valuta)
+DocType: Sales Partner,Referral Code,Kod preporuke
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Ukupan iznos avansa ne može biti veći od ukupnog sankcionisanog iznosa
 DocType: Salary Slip,Hour Rate,Cijena sata
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Omogući automatsku ponovnu narudžbu
@@ -5296,6 +5317,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Show Stock Quantity
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Neto novčani tok od operacije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Redak broj {0}: Status mora biti {1} za popust fakture {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Stavka 4
 DocType: Student Admission,Admission End Date,Prijem Završni datum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Podugovaranje
@@ -5318,6 +5340,7 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Povratni dnevnik
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Kreirajte Job Card
+DocType: Quotation,Referral Sales Partner,Preporuka prodajni partner
 DocType: Quality Procedure Process,Process Description,Opis procesa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Klijent {0} je kreiran.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Trenutno nema dostupnih trgovina na zalihama
@@ -5452,6 +5475,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Čitanje preuzete datoteke
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Prekinuto radno porudžbanje ne može se otkazati, Unstop prvi da otkaže"
+DocType: Coupon Code,Coupon Code,Kupon kod
 DocType: Asset,Journal Entry for Scrap,Journal Entry za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Red {0}: izaberite radnu stanicu protiv operacije {1}
@@ -5534,6 +5558,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Obavezan je datum
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Podataka uvoz i izvoz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Žao nam je, rok valjanosti kupona je istekao"
 DocType: Bank Account,Account Details,Detalji konta
 DocType: Crop,Materials Required,Potrebni materijali
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,No studenti Found
@@ -5571,6 +5596,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Idite na Korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za artikal {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Unesite važeći kod kupona !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Task,Task Description,Opis zadatka
 DocType: Training Event,Seminar,seminar
@@ -5834,6 +5860,7 @@
 ,TDS Payable Monthly,TDS se plaća mesečno
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Očekuje se zamena BOM-a. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Ukupna plaćanja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Meč plaćanja fakture
@@ -5923,6 +5950,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Uzmite sirovine za proizvodnju
 DocType: Job Opening,Job Title,Titula
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Buduće plaćanje Ref
+DocType: Quotation,Additional Discount and Coupon Code,Dodatni popust i kod kupona
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} označava da {1} neće dati citat, ali su svi stavci \ citirani. Ažuriranje statusa RFQ citata."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maksimalni uzorci - {0} su već zadržani za Batch {1} i Item {2} u Batch {3}.
@@ -6150,7 +6178,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Postavke za web stranice homepage
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} je na čekanju do {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ-ovi nisu dozvoljeni za {0} zbog stanja karte za rezultat {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Napravite kupnje proizvoda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Korišćeni listovi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Kupon se koristi {1}. Dozvoljena količina se iscrpljuje
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Želite li poslati materijalni zahtjev
 DocType: Job Offer,Awaiting Response,Čeka se odgovor
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-YYYY.-
@@ -6164,6 +6194,7 @@
 DocType: Training Event Employee,Optional,Neobavezno
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
+DocType: Sales Order,Skip Delivery Note,Preskočite dostavnicu
 DocType: Price List,Price Not UOM Dependent,Cijena nije UOM zavisna
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} kreirane varijante.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Ugovor o nivou usluge već postoji.
@@ -6268,6 +6299,7 @@
 DocType: Vehicle,Last Carbon Check,Zadnji Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Pravni troškovi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Molimo odaberite Količina na red
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Radni nalog {0}: kartica posla nije pronađena za operaciju {1}
 DocType: Purchase Invoice,Posting Time,Objavljivanje Vrijeme
 DocType: Timesheet,% Amount Billed,% Naplaćenog iznosa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefonski troškovi
@@ -6370,7 +6402,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma raspoloživog za upotrebu
 ,Sales Funnel,Tok prodaje (Funnel)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kolica
@@ -6466,6 +6497,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Točke lojalnosti će se izračunati iz potrošene (preko fakture za prodaju), na osnovu navedenog faktora sakupljanja."
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
+DocType: Pricing Rule,Coupon Code Based,Na osnovu koda kupona
 DocType: Company,HRA Settings,HRA Settings
 DocType: Homepage,Hero Section,Sekcija heroja
 DocType: Employee Transfer,Transfer Date,Datum prenosa
@@ -6581,6 +6613,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Molimo podesite Company filter prazno ako Skupina Od je &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Datum knjiženja ne može biti u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: {1} Serial No ne odgovara {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; Serija numeriranja
 DocType: Stock Entry,Target Warehouse Address,Adresa ciljne magacine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Casual dopust
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Vrijeme prije početka vremena smjene tijekom kojeg se prijava zaposlenika uzima u obzir za prisustvo.
@@ -6615,7 +6648,6 @@
 DocType: Employee Grade,Employee Grade,Razred zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,rad plaćen na akord
 DocType: GSTR 3B Report,June,Juna
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Share Balance,From No,Od br
 DocType: Shift Type,Early Exit Grace Period,Period prijevremenog izlaska
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -6900,7 +6932,6 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o nivou usluge sa tipom entiteta {0} i entitetom {1} već postoji.
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
@@ -7038,6 +7069,7 @@
 DocType: Budget,Warn,Upozoriti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Svi predmeti su već preneti za ovaj radni nalog.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
+DocType: Bank Account,Company Account,Račun kompanije
 DocType: Asset Maintenance,Manufacturing User,Proizvodnja korisnika
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
 DocType: Subscription Plan,Payment Plan,Plan placanja
@@ -7079,6 +7111,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne može biti veća od planirane količine ({2}) u radnom nalogu {3}
 DocType: Certification Application,Name of Applicant,Ime podnosioca zahteva
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Time Sheet za proizvodnju.
+DocType: Quick Stock Balance,Quick Stock Balance,Brzi bilans stanja
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,suma stavke
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ne mogu promijeniti svojstva varijante nakon transakcije sa akcijama. Za to ćete morati napraviti novu stavku.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA Mandat
@@ -7405,6 +7438,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Molimo postavite {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivan student
 DocType: Employee,Health Details,Zdravlje Detalji
+DocType: Coupon Code,Coupon Type,Vrsta kupona
 DocType: Leave Encashment,Encashable days,Encashable days
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Za kreiranje plaćanja Zahtjev je potrebno referentni dokument
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7688,6 +7722,7 @@
 DocType: Hotel Room Package,Amenities,Pogodnosti
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Automatski preuzmi Uvjete plaćanja
 DocType: QuickBooks Migrator,Undeposited Funds Account,Račun Undeposited Funds
+DocType: Coupon Code,Uses,Upotrebe
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Višestruki način plaćanja nije dozvoljen
 DocType: Sales Invoice,Loyalty Points Redemption,Povlačenje lojalnosti
 ,Appointment Analytics,Imenovanje analitike
@@ -7704,6 +7739,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Ukupni budžet
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Ostavite prazno ako napravite grupa studenata godišnje
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Nije moguće dodati Domen
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Da biste omogućili primanje / isporuku, ažurirajte &quot;Over Receipt / Dozvola za isporuku&quot; u Postavke zaliha ili Artikl."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Aplikacije koje koriste trenutni ključ neće moći da pristupe, da li ste sigurni?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7716,6 +7752,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ako nema dodeljenog vremenskog intervala, komunikacija će upravljati ovom grupom"
 DocType: Stock Reconciliation Item,Quantity Difference,Količina Razlika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 ,Electronic Invoice Register,Registar elektroničkih računa
@@ -7969,6 +8006,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,General Settings
 DocType: Article,Article,Član
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Unesite kod kupona !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Od valute i valuta ne mogu biti isti
 DocType: Taxable Salary Slab,Percent Deduction,Procenat odbijanja
 DocType: GL Entry,To Rename,Preimenovati
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index e2e8ae2..fd11fe6 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Client Contacte
 DocType: Shift Type,Enable Auto Attendance,Activa l&#39;assistència automàtica
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Introduïu la data i el magatzem
 DocType: Lost Reason Detail,Opportunity Lost Reason,Motiu perdut per l&#39;oportunitat
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
 DocType: Retention Bonus,Bonus Payment Date,Data de pagament addicional
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Comandes de treball realitzats
 DocType: Support Settings,Forum Posts,Missatges del Fòrum
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","La tasca es va obtenir com a tasca de fons. En cas que hi hagi algun problema sobre el processament en segon pla, el sistema afegirà un comentari sobre l&#39;error d&#39;aquesta reconciliació d&#39;existències i tornarà a la fase d&#39;esborrany."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Ho sentim, la validesa del codi de cupó no s&#39;ha iniciat"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,base imposable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: Leave Policy,Leave Policy Details,Deixeu els detalls de la política
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumible
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,grau
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;articles&gt; Marca
 DocType: Restaurant Table,No of Seats,No de seients
 DocType: Sales Invoice,Overdue and Discounted,Retardat i descomptat
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Trucada desconnectada
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlineat de la suma en paraules
 DocType: Vehicle,Additional Details,Detalls addicionals
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Cap descripció donada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Obtenir articles de magatzem
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Sol·licitud de venda.
 DocType: POS Closing Voucher Details,Collected Amount,Import acumulat
 DocType: Lab Test,Submitted Date,Data enviada
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Aprendre
 ,Trial Balance (Simple),Saldo de prova (simple)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Activa la despesa diferida
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Codi de cupó aplicat
 DocType: Asset,Next Depreciation Date,Següent Depreciació Data
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Cost Activitat per Empleat
 DocType: Accounts Settings,Settings for Accounts,Ajustaments de Comptes
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Ordre de treball
 DocType: Sales Invoice,Total Qty,Quantitat total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID de correu electrònic
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Si us plau, suprimiu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 DocType: Item,Show in Website (Variant),Mostra en el lloc web (variant)
 DocType: Employee,Health Concerns,Problemes de Salut
 DocType: Payroll Entry,Select Payroll Period,Seleccioneu el període de nòmina
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Compte de retenció d&#39;impostos
 DocType: Pricing Rule,Sales Partner,Soci de vendes
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Tots els quadres de comandament del proveïdor.
+DocType: Coupon Code,To be used to get discount,Per ser utilitzat per obtenir descompte
 DocType: Buying Settings,Purchase Receipt Required,Es requereix rebut de compra
 DocType: Sales Invoice,Rail,Ferrocarril
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Cost real
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Pla de producció
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Obrir l&#39;eina de creació de la factura
 DocType: Salary Component,Round to the Nearest Integer,Ronda a l’entitat més propera
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Permetre afegir articles a la cistella
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Devolucions de vendes
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Establir Qty en les transaccions basades en la entrada sense sèrie
 ,Total Stock Summary,Resum de la total
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa bàsica d&#39;Hora (Companyia de divises)
 ,Qty To Be Billed,Quantitat per ser facturat
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Quantitat lliurada
+DocType: Coupon Code,Gift Card,Targeta Regal
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Quantitat reservada per a la producció: quantitat de matèries primeres per fabricar articles de fabricació.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data de reemborsament
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Aquesta transacció bancària ja està totalment conciliada
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Crea un full de temps
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Factures de compra
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Només podeu renovar si la vostra pertinença caduca en un termini de 30 dies
 DocType: Shopping Cart Settings,Show Stock Availability,Mostra la disponibilitat d&#39;existències
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Estableix {0} a la categoria d&#39;actius {1} o a l&#39;empresa {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservats Quantitat: Quantitat va ordenar a la venda, però no entregat."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Torneu a seleccionar, si l&#39;adreça escollida s&#39;edita després de desar-la"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Quantitat reservada per al subcontracte: quantitat de matèries primeres per fabricar articles subcontractats.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Quantitat reservada per al subcontracte: quantitat de matèries primeres per fabricar articles subcontractats.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 DocType: Item,Hub Publishing Details,Detalls de publicació del Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Obertura&#39;
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Importació d&#39;elements i OIM
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstec Monto
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,S&#39;ha afegit als detalls
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Ho sentim, el codi de cupó s&#39;ha esgotat"
 DocType: Communication Medium,Catch All,Agafa tot
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Calendari de Cursos
 DocType: Budget,Applicable on Material Request,Aplicable a la sol·licitud de material
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atribut no vàlid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} s'ha de Presentar
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Campanyes de correu electrònic
+DocType: Sales Partner,To Track inbound purchase,Per fer el seguiment de la compra entrant
 DocType: Buying Settings,Default Supplier Group,Grup de proveïdors per defecte
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},La quantitat màxima elegible per al component {0} supera {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Fes una entrada en accions
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuari de la reserva d&#39;hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Definiu l&#39;estat
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; Sèries de numeració
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Seleccioneu el prefix primer
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu Naming Series per {0} a través de Configuració&gt; Configuració&gt; Sèries de noms
 DocType: Contract,Fulfilment Deadline,Termini de compliment
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,A prop teu
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,Sota revisió
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,No s&#39;ha pogut iniciar la sessió
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Asset {0} creat
+DocType: Coupon Code,Promotional,Promocional
 DocType: Special Test Items,Special Test Items,Elements de prova especials
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Heu de ser un usuari amb les funcions d&#39;Administrador del sistema i d&#39;Administrador d&#39;elements per registrar-se a Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Informes clau
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Tipus Doc
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
 DocType: Subscription Plan,Billing Interval Count,Compte d&#39;interval de facturació
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Elimineu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Nomenaments i trobades de pacients
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Valor que falta
 DocType: Employee,Department and Grade,Departament i grau
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Les dates d&#39;inici i fi
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Termes de compliment de la plantilla de contracte
 ,Delivered Items To Be Billed,Articles lliurats pendents de facturar
+DocType: Coupon Code,Maximum Use,Ús màxim
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Obrir la llista de materials {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Magatzem no pot ser canviat pel Nº de Sèrie
 DocType: Authorization Rule,Average Discount,Descompte Mig
@@ -2585,6 +2598,7 @@
 DocType: Item,Inventory,Inventari
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Descarregueu com a Json
 DocType: Item,Sales Details,Detalls de venda
+DocType: Coupon Code,Used,Utilitzat
 DocType: Opportunity,With Items,Amb articles
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',La campanya &#39;{0}&#39; ja existeix per a la {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Equip de manteniment
@@ -2714,7 +2728,7 @@
 						Serial No cannot be ensured",No s&#39;ha trobat cap BOM actiu per a l&#39;element {0}. El lliurament per \ Serial No no es pot garantir
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,La quantitat màxima del préstec
-DocType: Pricing Rule,Pricing Rule,Regla preus
+DocType: Coupon Code,Pricing Rule,Regla preus
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 DocType: Company,Default Selling Terms,Condicions de venda predeterminades
@@ -2793,6 +2807,7 @@
 DocType: Payment Schedule,Payment Amount,Quantitat de pagament
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,La data de mig dia ha d&#39;estar entre el treball des de la data i la data de finalització del treball
 DocType: Healthcare Settings,Healthcare Service Items,Articles de serveis sanitaris
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Codi de barres no vàlid. No hi ha cap article adjunt a aquest codi de barres.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Canvi Net en Efectiu
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
@@ -2912,7 +2927,6 @@
 DocType: Share Transfer,Asset Account,Compte d&#39;actius
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nova data de llançament hauria de ser en el futur
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 DocType: Lab Test,Technician Name,Tècnic Nom
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3023,6 +3037,7 @@
 DocType: Products Settings,Hide Variants,Amagueu les variants
 DocType: Lead,Next Contact By,Següent Contactar Per
 DocType: Compensatory Leave Request,Compensatory Leave Request,Sol·licitud de baixa compensatòria
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","No es pot generar l&#39;excés de l&#39;element {0} a la fila {1} més de {2}. Per permetre l&#39;excés de facturació, establiu la quantitat a la configuració del compte"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Quantitat necessària per Punt {0} a la fila {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Magatzem {0} no es pot eliminar com existeix quantitat d'article {1}
 DocType: Blanket Order,Order Type,Tipus d'ordre
@@ -3192,7 +3207,6 @@
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
 DocType: Employee Benefit Claim,Claim Benefit For,Reclamació per benefici
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No es pot superar l&#39;element {0} a la fila {1} més que {2}. Per permetre una facturació excessiva, configureu-la a Configuració de valors"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Actualitza la resposta
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3483,6 +3497,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,"Si us plau, especifiqui la moneda a l'empresa"
 DocType: Workstation,Wages per hour,Els salaris per hora
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Configura {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Estoc equilibri en Lot {0} es convertirà en negativa {1} per a la partida {2} a Magatzem {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Després de sol·licituds de materials s&#39;han plantejat de forma automàtica segons el nivell de re-ordre de l&#39;article
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
@@ -3812,6 +3827,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Presentar nòmina
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,En espera
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Una qustion ha de tenir almenys una opció correcta
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Ordres de compra
 DocType: Account,Inter Company Account,Compte d&#39;empresa Inter
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Importació a granel
 DocType: Sales Partner,Address & Contacts,Direcció i contactes
@@ -3822,6 +3838,7 @@
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Staffing Plan Detail,Number Of Positions,Nombre de posicions
 DocType: Vital Signs,Blood Pressure (diastolic),Pressió sanguínia (diastòlica)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Seleccioneu el client.
 DocType: SMS Log,Sent To,Enviat A
 DocType: Agriculture Task,Holiday Management,Gestió de vacances
 DocType: Payment Request,Make Sales Invoice,Fer Factura Vendes
@@ -4031,7 +4048,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} no está presentat
 DocType: Subscription,Trialling,Trialling
 DocType: Sales Invoice Item,Deferred Revenue,Ingressos diferits
-DocType: Bank Account,GL Account,Compte GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,El compte de caixa s&#39;utilitzarà per a la creació de factures de vendes
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Subcategoria d&#39;exempció
 DocType: Member,Membership Expiry Date,Data de venciment de la pertinença
@@ -4455,13 +4471,13 @@
 DocType: C-Form Invoice Detail,Territory,Territori
 DocType: Pricing Rule,Apply Rule On Item Code,Aplica la regla del codi de l&#39;article
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Si us plau, no de visites requerides"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Informe de saldos
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,quota
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Mostra la quantitat acumulativa
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Actualització en progrés. Pot trigar un temps.
 DocType: Production Plan Item,Produced Qty,Quant produït
 DocType: Vehicle Log,Fuel Qty,Quantitat de combustible
-DocType: Stock Entry,Target Warehouse Name,Nom del magatzem de destinació
 DocType: Work Order Operation,Planned Start Time,Planificació de l'hora d'inici
 DocType: Course,Assessment,valoració
 DocType: Payment Entry Reference,Allocated,Situat
@@ -4539,10 +4555,12 @@
  1. Formes de disputes que aborden, indemnització, responsabilitat, etc. 
  1. Adreça i contacte de la seva empresa."
 DocType: Homepage Section,Section Based On,Secció Basada en
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Mostra Aplica el codi de cupó
 DocType: Issue,Issue Type,Tipus d&#39;emissió
 DocType: Attendance,Leave Type,Tipus de llicència
 DocType: Purchase Invoice,Supplier Invoice Details,Detalls de la factura del proveïdor
 DocType: Agriculture Task,Ignore holidays,Ignora les vacances
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Afegiu / editeu les condicions del cupó
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"El compte de despeses / diferències ({0}) ha de ser un compte ""Guany o Pèrdua '"
 DocType: Stock Entry Detail,Stock Entry Child,Entrada d’accions d’infants
 DocType: Project,Copied From,de copiat
@@ -4717,6 +4735,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteris d&#39;avaluació del pla
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transaccions
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar les comandes de compra
+DocType: Coupon Code,Coupon Name,Nom del cupó
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Susceptible
 DocType: Email Campaign,Scheduled,Programat
 DocType: Shift Type,Working Hours Calculation Based On,Basat en el càlcul de les hores de treball
@@ -4733,7 +4752,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Crear Variants
 DocType: Vehicle,Diesel,dièsel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,No s'ha escollit una divisa per la llista de preus
+DocType: Quick Stock Balance,Available Quantity,Quantitat disponible
 DocType: Purchase Invoice,Availed ITC Cess,Aprovat ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; Configuració d’educació
 ,Student Monthly Attendance Sheet,Estudiant Full d&#39;Assistència Mensual
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,La norma d&#39;enviament només és aplicable per a la venda
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila d&#39;amortització {0}: la següent data de depreciació no pot ser abans de la data de compra
@@ -4800,8 +4821,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
 DocType: Quality Meeting,Quality Meeting,Reunió de qualitat
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,No al Grup Grup
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu Naming Series per {0} a través de Configuració&gt; Configuració&gt; Sèries de noms
 DocType: Employee,ERPNext User,Usuari ERPNext
+DocType: Coupon Code,Coupon Description,Descripció del cupó
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Lot és obligatori a la fila {0}
 DocType: Company,Default Buying Terms,Condicions de compra per defecte
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Rebut de compra dels articles subministrats
@@ -4964,6 +4985,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra Detall del document núm
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La supressió no està permesa per al país {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Tipus del partit és obligatori
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Apliqueu el codi de cupó
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Per a la targeta de treball {0}, només podeu fer l&#39;entrada al material &quot;Tipus de transferència de material per a la fabricació&quot;"
 DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Customer Feedback Table,Customer Feedback Table,Taula de comentaris dels clients
@@ -5113,7 +5135,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Enviament de la comanda de compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Afegeix tots els proveïdors
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Tally Migration,Parties,Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Préstecs Garantits
@@ -5145,7 +5166,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},No permetis establir un element alternatiu per a l&#39;element {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Signant Autoritzat
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; Configuració d’educació
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),TIC net disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crea tarifes
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
@@ -5170,6 +5190,7 @@
 DocType: Quiz Result,Wrong,Mal
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Velocitat a la qual la llista de preus de divises es converteix la moneda base del client
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Import net (Companyia moneda)
+DocType: Sales Partner,Referral Code,Codi de Referència
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,L&#39;import anticipat total no pot ser superior al total de la quantitat sancionada
 DocType: Salary Slip,Hour Rate,Hour Rate
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Activa la reordena automàtica
@@ -5298,6 +5319,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Mostra la quantitat d&#39;existències
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Efectiu net de les operacions
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Fila # {0}: l&#39;estat ha de ser {1} per descomptar la factura {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;element: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Article 4
 DocType: Student Admission,Admission End Date,L&#39;entrada Data de finalització
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,la subcontractació
@@ -5320,6 +5342,7 @@
 DocType: Travel Request,Fully Sponsored,Totalment patrocinat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Entrada periòdica inversa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Crea la targeta de treball
+DocType: Quotation,Referral Sales Partner,Soci de vendes de derivacions
 DocType: Quality Procedure Process,Process Description,Descripció del procés
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,S&#39;ha creat el client {0}.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Actualment no hi ha existències disponibles en cap magatzem
@@ -5454,6 +5477,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Llegint el fitxer carregat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","No es pot cancel·lar la comanda de treball parada, sense desactivar-lo primer a cancel·lar"
+DocType: Coupon Code,Coupon Code,Codi de cupó
 DocType: Asset,Journal Entry for Scrap,Entrada de diari de la ferralla
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,"Si us plau, tiri d'articles de lliurament Nota"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Fila {0}: seleccioneu l&#39;estació de treball contra l&#39;operació {1}
@@ -5536,6 +5560,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,És necessària la «data»
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Les dades d&#39;importació i exportació
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Ho sentim, la validesa del codi de cupó ha caducat"
 DocType: Bank Account,Account Details,Detalls del compte
 DocType: Crop,Materials Required,Materials obligatoris
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,No s&#39;han trobat estudiants
@@ -5573,6 +5598,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Aneu als usuaris
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Quantitat pagada + s'amortitza La quantitat no pot ser més gran que la Gran Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},El Número de Lot {0} de l'Article {1} no és vàlid
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Introduïu el codi de cupó vàlid !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Note: There is not enough leave balance for Leave Type {0}
 DocType: Task,Task Description,Descripció de la tasca
 DocType: Training Event,Seminar,seminari
@@ -5837,6 +5863,7 @@
 ,TDS Payable Monthly,TDS mensuals pagables
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,En espera per reemplaçar la BOM. Pot trigar uns minuts.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Total de pagaments
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Nº de Sèrie Necessari per article serialitzat {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Els pagaments dels partits amb les factures
@@ -5926,6 +5953,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Obtenir matèries primeres per a la producció
 DocType: Job Opening,Job Title,Títol Professional
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Pagament futur Ref
+DocType: Quotation,Additional Discount and Coupon Code,Codi de descompte addicional i cupó
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indica que {1} no proporcionarà una cita, però tots els ítems s&#39;han citat. Actualització de l&#39;estat de la cotització de RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,S&#39;han conservat les mostres màximes ({0}) per al lot {1} i l&#39;element {2} en lot {3}.
@@ -6153,7 +6181,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Ajustos per a la pàgina d&#39;inici pàgina web
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} està en espera fins a {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Les RFQ no estan permeses per {0} a causa d&#39;un quadre de comandament de peu de {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Feu Compra Factura
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Fulles utilitzades
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} El cupó utilitzat són {1}. La quantitat permesa s’esgota
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Voleu enviar la sol·licitud de material
 DocType: Job Offer,Awaiting Response,Espera de la resposta
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH -YYYY.-
@@ -6167,6 +6197,7 @@
 DocType: Training Event Employee,Optional,Opcional
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 DocType: Agriculture Analysis Criteria,Water Analysis,Anàlisi de l&#39;aigua
+DocType: Sales Order,Skip Delivery Note,Omet el lliurament
 DocType: Price List,Price Not UOM Dependent,Preu no dependent de UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,S&#39;han creat {0} variants.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Ja existeix un acord de nivell de servei per defecte.
@@ -6271,6 +6302,7 @@
 DocType: Vehicle,Last Carbon Check,Últim control de Carboni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Despeses legals
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Si us plau seleccioni la quantitat al corredor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Ordre de treball {0}: no s&#39;ha trobat la targeta de treball per a l&#39;operació {1}
 DocType: Purchase Invoice,Posting Time,Temps d'enviament
 DocType: Timesheet,% Amount Billed,% Import Facturat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Despeses telefòniques
@@ -6373,7 +6405,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,La fila de depreciació {0}: la següent data de la depreciació no pot ser abans de la data d&#39;ús disponible
 ,Sales Funnel,Sales Funnel
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;articles&gt; Marca
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carro
@@ -6469,6 +6500,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Els punts de fidelització es calcularan a partir del fet gastat (a través de la factura de vendes), segons el factor de recollida esmentat."
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
+DocType: Pricing Rule,Coupon Code Based,Basat en codi de cupó
 DocType: Company,HRA Settings,Configuració HRA
 DocType: Homepage,Hero Section,Secció Herois
 DocType: Employee Transfer,Transfer Date,Data de transferència
@@ -6584,6 +6616,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Si us plau ajust empresa de filtres en blanc si és Agrupa per &#39;empresa&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Data d&#39;entrada no pot ser data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: Nombre de sèrie {1} no coincideix amb {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; Sèries de numeració
 DocType: Stock Entry,Target Warehouse Address,Adreça de destinació de magatzem
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Deixar Casual
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,El temps abans de l&#39;hora d&#39;inici del torn durant el qual es preveu el registre d&#39;entrada dels empleats per assistència.
@@ -6618,7 +6651,6 @@
 DocType: Employee Grade,Employee Grade,Grau d&#39;empleat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Treball a preu fet
 DocType: GSTR 3B Report,June,juny
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Share Balance,From No,Del núm
 DocType: Shift Type,Early Exit Grace Period,Període de gràcia de sortida
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
@@ -6903,7 +6935,6 @@
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;element: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ja existeix un contracte de nivell de servei amb el tipus d&#39;entitat {0} i l&#39;entitat {1}.
 DocType: Journal Entry,Write Off Entry,Escriu Off Entrada
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
@@ -7041,6 +7072,7 @@
 DocType: Budget,Warn,Advertir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Ja s&#39;han transferit tots els ítems per a aquesta Ordre de treball.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
+DocType: Bank Account,Company Account,Compte de l&#39;empresa
 DocType: Asset Maintenance,Manufacturing User,Usuari de fabricació
 DocType: Purchase Invoice,Raw Materials Supplied,Matèries primeres subministrades
 DocType: Subscription Plan,Payment Plan,Pla de pagament
@@ -7082,6 +7114,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) no pot ser major que la quantitat planificada  ({2}) a l'Ordre de Treball {3}
 DocType: Certification Application,Name of Applicant,Nom del sol · licitant
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Full de temps per a la fabricació.
+DocType: Quick Stock Balance,Quick Stock Balance,Saldo de valors ràpids
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,total parcial
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No es poden canviar les propietats de variants després de la transacció d&#39;accions. Haureu de fer un nou element per fer-ho.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,Mandat de SEPA GoCardless
@@ -7408,6 +7441,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},"Si us plau, estableix {0}"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} és estudiant inactiu
 DocType: Employee,Health Details,Detalls de la Salut
+DocType: Coupon Code,Coupon Type,Tipus de cupó
 DocType: Leave Encashment,Encashable days,Dies incondicionals
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Per a crear una sol·licitud de pagament es requereix document de referència
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7691,6 +7725,7 @@
 DocType: Hotel Room Package,Amenities,Serveis
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Recupera automàticament els termes de pagament
 DocType: QuickBooks Migrator,Undeposited Funds Account,Compte de fons no transferit
+DocType: Coupon Code,Uses,Usos
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,No es permet el mode de pagament múltiple per defecte
 DocType: Sales Invoice,Loyalty Points Redemption,Punts de lleialtat Redenció
 ,Appointment Analytics,Anàlisi de cites
@@ -7707,6 +7742,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Pressupost total
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deixar en blanc si fas grups d&#39;estudiants per any
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si es marca, número total. de dies de treball s'inclouran els festius, i això reduirà el valor de Salari per dia"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,No s&#39;ha pogut afegir domini
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Per permetre el rebut / lliurament, actualitzeu &quot;Indemnització de recepció / lliurament&quot; a la configuració de les accions o a l&#39;article."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Les aplicacions que utilitzin la clau actual no podran accedir, segurament?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7719,6 +7755,7 @@
 ,BOM Stock Report,La llista de materials d&#39;Informe
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Si no hi ha un timelot assignat, aquest grup la gestionarà la comunicació"
 DocType: Stock Reconciliation Item,Quantity Difference,quantitat Diferència
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 ,Electronic Invoice Register,Registre de factures electròniques
@@ -7972,6 +8009,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impostos i despeses deduïdes (Companyia moneda)
 DocType: Item Group,General Settings,Configuració general
 DocType: Article,Article,Article
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Introduïu el codi del cupó !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Des moneda i moneda no pot ser el mateix
 DocType: Taxable Salary Slab,Percent Deduction,Deducció per cent
 DocType: GL Entry,To Rename,Per canviar el nom
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index aa526b1..43dd383 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kontakt se zákazníky
 DocType: Shift Type,Enable Auto Attendance,Povolit automatickou účast
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Zadejte prosím sklad a datum
 DocType: Lost Reason Detail,Opportunity Lost Reason,Příležitost Ztracený důvod
 DocType: Patient Appointment,Check availability,Zkontrolujte dostupnost
 DocType: Retention Bonus,Bonus Payment Date,Bonus Datum platby
@@ -264,6 +265,7 @@
 ,Completed Work Orders,Dokončené pracovní příkazy
 DocType: Support Settings,Forum Posts,Příspěvky ve fóru
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",Úkol byl označen jako úloha na pozadí. V případě jakéhokoli problému se zpracováním na pozadí přidá systém komentář k chybě v tomto smíření zásob a vrátí se do fáze konceptu.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Litujeme, platnost kódu kupónu nezačala"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Zdanitelná částka
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Zanechat podrobnosti o zásadách
@@ -329,6 +331,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Spotřební
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Školní známka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Restaurant Table,No of Seats,Počet sedadel
 DocType: Sales Invoice,Overdue and Discounted,Po lhůtě splatnosti a se slevou
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Hovor byl odpojen
@@ -505,6 +508,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,řádkování za částku ve slovech
 DocType: Vehicle,Additional Details,další detaily
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,No vzhledem k tomu popis
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Načíst položky ze skladu
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Žádost o koupi.
 DocType: POS Closing Voucher Details,Collected Amount,Sběrná částka
 DocType: Lab Test,Submitted Date,Datum odeslání
@@ -612,6 +616,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Učit se
 ,Trial Balance (Simple),Zkušební zůstatek (jednoduchý)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Aktivovat odložený náklad
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Kód použitého kupónu
 DocType: Asset,Next Depreciation Date,Vedle Odpisy Datum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Náklady na činnost na jednoho zaměstnance
 DocType: Accounts Settings,Settings for Accounts,Nastavení účtů
@@ -847,8 +852,6 @@
 DocType: BOM,Work Order,Zakázka
 DocType: Sales Invoice,Total Qty,Celkem Množství
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-mailu Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Item,Show in Website (Variant),Show do webových stránek (Variant)
 DocType: Employee,Health Concerns,Zdravotní Obavy
 DocType: Payroll Entry,Select Payroll Period,Vyberte mzdové
@@ -1012,6 +1015,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Účet pro zadržení daně
 DocType: Pricing Rule,Sales Partner,Sales Partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Všechna hodnocení dodavatelů.
+DocType: Coupon Code,To be used to get discount,Slouží k získání slevy
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
 DocType: Sales Invoice,Rail,Železnice
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Aktuální cena
@@ -1062,6 +1066,7 @@
 DocType: Production Plan,Production Plan,Plán produkce
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otevření nástroje pro vytváření faktur
 DocType: Salary Component,Round to the Nearest Integer,Zaokrouhlí na nejbližší celé číslo
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Povolit přidání zboží, které není na skladě, do košíku"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Sales Return
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Nastavte počet transakcí na základě sériového č. Vstupu
 ,Total Stock Summary,Shrnutí souhrnného stavu
@@ -1191,6 +1196,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Základna hodinová sazba (Company měny)
 ,Qty To Be Billed,Množství k vyúčtování
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Dodává Částka
+DocType: Coupon Code,Gift Card,Dárková poukázka
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Vyhrazeno Množství pro výrobu: Množství surovin pro výrobu výrobních položek.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum vykoupení
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Tato bankovní transakce je již plně sladěna
@@ -1278,6 +1284,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Vytvoření časového rozvrhu
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Nákup faktur
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Můžete obnovit pouze tehdy, pokud vaše členství vyprší během 30 dnů"
 DocType: Shopping Cart Settings,Show Stock Availability,Zobrazit dostupnost skladem
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Nastavte {0} v kategorii aktiv {1} nebo ve firmě {2}
@@ -1573,7 +1580,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserved Množství: Množství objednal k prodeji, ale není doručena."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Znovu vyberte, pokud je zvolená adresa po uložení upravena"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Vyhrazeno Množství pro subdodávky: Množství surovin pro výrobu subdodávek.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Vyhrazeno Množství pro subdodávky: Množství surovin pro výrobu subdodávek.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 DocType: Item,Hub Publishing Details,Podrobnosti o publikování Hubu
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',"""Otevírací"""
@@ -1836,6 +1843,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Import položek a UOM
 DocType: Repayment Schedule,Balance Loan Amount,Balance Výše úvěru
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Přidáno do podrobností
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Litujeme, kód kupónu je vyčerpán"
 DocType: Communication Medium,Catch All,Chytit vše
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,rozvrh
 DocType: Budget,Applicable on Material Request,Použitelné na žádosti o materiál
@@ -2003,6 +2011,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Neplatný Atribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-mailové kampaně
+DocType: Sales Partner,To Track inbound purchase,Chcete-li sledovat příchozí nákup
 DocType: Buying Settings,Default Supplier Group,Výchozí skupina dodavatelů
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Maximální částka způsobilá pro komponentu {0} přesahuje {1}
@@ -2158,8 +2167,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Proveďte zadávání zásob
 DocType: Hotel Room Reservation,Hotel Reservation User,Uživatel rezervace ubytování
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Nastavit stav
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Číslovací řady
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Prosím, vyberte první prefix"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Nastavení&gt; Nastavení&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Termín splnění
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Ve vašem okolí
 DocType: Student,O-,Ó-
@@ -2283,6 +2292,7 @@
 DocType: Quality Meeting Table,Under Review,Probíhá kontrola
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Přihlášení selhalo
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Asset {0} vytvořen
+DocType: Coupon Code,Promotional,Propagační
 DocType: Special Test Items,Special Test Items,Speciální zkušební položky
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Musíte být uživatelem s rolí Správce systému a Správce položek, který se má zaregistrovat na webu Marketplace."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Klíčové zprávy
@@ -2320,6 +2330,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
 DocType: Subscription Plan,Billing Interval Count,Počet fakturačních intervalů
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Setkání a setkání s pacienty
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Hodnota chybí
 DocType: Employee,Department and Grade,Oddělení a stupeň
@@ -2422,6 +2434,7 @@
 DocType: Project,Start and End Dates,Datum zahájení a ukončení
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Podmínky splnění šablony smlouvy
 ,Delivered Items To Be Billed,Dodávaných výrobků fakturovaných
+DocType: Coupon Code,Maximum Use,Maximální využití
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Otevřená BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Warehouse nemůže být změněn pro Serial No.
 DocType: Authorization Rule,Average Discount,Průměrná sleva
@@ -2584,6 +2597,7 @@
 DocType: Item,Inventory,Inventář
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Stáhnout jako Json
 DocType: Item,Sales Details,Prodejní Podrobnosti
+DocType: Coupon Code,Used,Použitý
 DocType: Opportunity,With Items,S položkami
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampaň &#39;{0}&#39; již existuje pro {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Tým údržby
@@ -2713,7 +2727,7 @@
 						Serial No cannot be ensured",Pro položku {0} nebyl nalezen žádný aktivní kusovníček. Dodání pomocí \ sériového čísla nemůže být zajištěno
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximální výše úvěru
-DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
+DocType: Coupon Code,Pricing Rule,Ceny Pravidlo
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplicitní číslo role pro studenty {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 DocType: Company,Default Selling Terms,Výchozí prodejní podmínky
@@ -2792,6 +2806,7 @@
 DocType: Payment Schedule,Payment Amount,Částka platby
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Den poločasu by měl být mezi dnem práce a datem ukončení práce
 DocType: Healthcare Settings,Healthcare Service Items,Položky zdravotnické služby
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Neplatný čárový kód. K tomuto čárovému kódu není připojena žádná položka.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Čistá změna v hotovosti
 DocType: Assessment Plan,Grading Scale,Klasifikační stupnice
@@ -2911,7 +2926,6 @@
 DocType: Share Transfer,Asset Account,Účet aktiv
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nové datum vydání by mělo být v budoucnosti
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; Nastavení lidských zdrojů
 DocType: Lab Test,Technician Name,Jméno technika
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3022,6 +3036,7 @@
 DocType: Products Settings,Hide Variants,Skrýt varianty
 DocType: Lead,Next Contact By,Další Kontakt By
 DocType: Compensatory Leave Request,Compensatory Leave Request,Žádost o kompenzační dovolenou
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nelze přeplatit za položku {0} v řádku {1} více než {2}. Chcete-li povolit nadměrnou fakturaci, nastavte v Nastavení účtu povolenky"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Množství požadované pro bodě {0} v řadě {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Sklad {0} nelze smazat, protože existuje množství k položce {1}"
 DocType: Blanket Order,Order Type,Typ objednávky
@@ -3191,7 +3206,6 @@
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
 DocType: Employee Benefit Claim,Claim Benefit For,Nárok na dávku pro
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Nelze přepsat položku {0} v řádku {1} více než {2}. Chcete-li povolit přeúčtování, nastavte prosím nastavení akcií"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Aktualizace odpovědi
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3482,6 +3496,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,"Uveďte prosím měnu, ve společnosti"
 DocType: Workstation,Wages per hour,Mzda za hodinu
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurovat {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Sklad bilance v dávce {0} se zhorší {1} k bodu {2} ve skladu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Následující materiál žádosti byly automaticky zvýšena na základě úrovni re-pořadí položky
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
@@ -3811,6 +3826,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Odeslat výplatní pásce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Pozastaveno
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Spalování musí mít alespoň jednu správnou možnost
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Objednávky
 DocType: Account,Inter Company Account,Inter podnikový účet
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Dovoz hromadnou
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
@@ -3821,6 +3837,7 @@
 DocType: POS Profile,[Select],[Vybrat]
 DocType: Staffing Plan Detail,Number Of Positions,Počet pozic
 DocType: Vital Signs,Blood Pressure (diastolic),Krevní tlak (diastolický)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Vyberte prosím zákazníka.
 DocType: SMS Log,Sent To,Odeslána
 DocType: Agriculture Task,Holiday Management,Správa prázdnin
 DocType: Payment Request,Make Sales Invoice,Proveďte prodejní faktuře
@@ -4030,7 +4047,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} není odesláno
 DocType: Subscription,Trialling,Testování
 DocType: Sales Invoice Item,Deferred Revenue,Odložené výnosy
-DocType: Bank Account,GL Account,GL účet
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Hotovostní účet bude použit pro vytvoření faktury
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Osvobození podkategorie
 DocType: Member,Membership Expiry Date,Datum ukončení členství
@@ -4454,13 +4470,13 @@
 DocType: C-Form Invoice Detail,Territory,Území
 DocType: Pricing Rule,Apply Rule On Item Code,Použít pravidlo na kód položky
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Zpráva o stavu zásob
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Poplatek
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Zobrazit kumulativní částku
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aktualizace probíhá. Může chvíli trvat.
 DocType: Production Plan Item,Produced Qty,Vyrobeno množství
 DocType: Vehicle Log,Fuel Qty,palivo Množství
-DocType: Stock Entry,Target Warehouse Name,Název cílového skladu
 DocType: Work Order Operation,Planned Start Time,Plánované Start Time
 DocType: Course,Assessment,Posouzení
 DocType: Payment Entry Reference,Allocated,Přidělené
@@ -4538,10 +4554,12 @@
  1. Způsoby řešení sporů, náhrady škody, odpovědnosti za škodu, atd 
  1. Adresa a kontakt na vaši společnost."
 DocType: Homepage Section,Section Based On,Sekce založená na
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Zobrazit Použít kód kupónu
 DocType: Issue,Issue Type,Typ vydání
 DocType: Attendance,Leave Type,Typ absence
 DocType: Purchase Invoice,Supplier Invoice Details,Dodavatel fakturační údaje
 DocType: Agriculture Task,Ignore holidays,Ignorovat svátky
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Přidat / upravit podmínky kupónu
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Náklady / Rozdíl účtu ({0}), musí být ""zisk nebo ztráta"" účet"
 DocType: Stock Entry Detail,Stock Entry Child,Zásoby dítě
 DocType: Project,Copied From,Zkopírován z
@@ -4716,6 +4734,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Assessment Criteria
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transakce
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Zabránit nákupním objednávkám
+DocType: Coupon Code,Coupon Name,Název kupónu
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Citlivý
 DocType: Email Campaign,Scheduled,Plánované
 DocType: Shift Type,Working Hours Calculation Based On,Výpočet pracovní doby na základě
@@ -4732,7 +4751,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Vytvoření variant
 DocType: Vehicle,Diesel,motorová nafta
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Ceníková Měna není zvolena
+DocType: Quick Stock Balance,Available Quantity,dostupné množství
 DocType: Purchase Invoice,Availed ITC Cess,Využil ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; Nastavení vzdělávání
 ,Student Monthly Attendance Sheet,Student měsíční návštěvnost Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Pravidlo plavby platí pouze pro prodej
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Odpisový řádek {0}: Další datum odpisu nemůže být před datem nákupu
@@ -4799,8 +4820,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
 DocType: Quality Meeting,Quality Meeting,Kvalitní setkání
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-skupiny ke skupině
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Nastavení&gt; Nastavení&gt; Naming Series
 DocType: Employee,ERPNext User,ERPN další uživatel
+DocType: Coupon Code,Coupon Description,Popis kupónu
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Dávka je povinná v řádku {0}
 DocType: Company,Default Buying Terms,Výchozí nákupní podmínky
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Doklad o koupi Item Dodávané
@@ -4963,6 +4984,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Detail dokumentu č
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Smazání není povoleno pro zemi {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Typ strana je povinná
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Použijte kód kupónu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",U karty zaměstnání {0} můžete provést pouze záznam typu „Převod materiálu pro výrobu“
 DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Customer Feedback Table,Customer Feedback Table,Tabulka zpětné vazby od zákazníka
@@ -5112,7 +5134,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Při zadávání objednávky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Přidat všechny dodavatele
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Řádek # {0}: Přidělená částka nesmí být vyšší než zůstatek.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Tally Migration,Parties,Strany
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Procházet kusovník
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Zajištěné úvěry
@@ -5144,7 +5165,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Neumožňuje nastavit alternativní položku pro položku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Prokurista
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; Nastavení vzdělávání
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Dostupné ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Vytvořte poplatky
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
@@ -5169,6 +5189,7 @@
 DocType: Quiz Result,Wrong,Špatně
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Sazba, za kterou je ceníková měna převedena na základní měnu zákazníka"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Čistá částka (Company Měna)
+DocType: Sales Partner,Referral Code,Kód doporučení
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Celková výše zálohy nesmí být vyšší než celková částka sankce
 DocType: Salary Slip,Hour Rate,Hour Rate
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Povolit automatické opětovné objednání
@@ -5296,6 +5317,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Vyberte prosím kusovníku podle položky {0}
 DocType: Shopping Cart Settings,Show Stock Quantity,Zobrazit množství zásob
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Čistý peněžní tok z provozní
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Bod 4
 DocType: Student Admission,Admission End Date,Vstupné Datum ukončení
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Subdodávky
@@ -5318,6 +5340,7 @@
 DocType: Travel Request,Fully Sponsored,Plně sponzorováno
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Zadání reverzního deníku
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Vytvořit pracovní kartu
+DocType: Quotation,Referral Sales Partner,Prodejní partner pro doporučení
 DocType: Quality Procedure Process,Process Description,Popis procesu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Zákazník {0} je vytvořen.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,V současné době žádné skladové zásoby nejsou k dispozici
@@ -5452,6 +5475,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Čtení nahraného souboru
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zastavená pracovní objednávka nemůže být zrušena, zrušte její zrušení"
+DocType: Coupon Code,Coupon Code,Kód kupónu
 DocType: Asset,Journal Entry for Scrap,Zápis do deníku do šrotu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,"Prosím, vytáhněte položky z dodací list"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Řádek {0}: vyberte pracovní stanici proti operaci {1}
@@ -5534,6 +5558,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Je požadováno „datum“
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Import dat a export
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Litujeme, platnost kódu kupónu vypršela"
 DocType: Bank Account,Account Details,Údaje o účtu
 DocType: Crop,Materials Required,Potřebné materiály
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Žádní studenti Nalezené
@@ -5571,6 +5596,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Přejděte na položku Uživatelé
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Uhrazená částka + odepsaná částka nesmí být větší než celková částka
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} není platná Šarže pro Položku {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Zadejte prosím platný kuponový kód !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Poznámka: Není k dispozici dostatek zůstatek dovolené dovolená za kalendářní typ {0}
 DocType: Task,Task Description,Popis ulohy
 DocType: Training Event,Seminar,Seminář
@@ -5834,6 +5860,7 @@
 ,TDS Payable Monthly,TDS splatné měsíčně
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Naléhá na výměnu kusovníku. Může to trvat několik minut.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; Nastavení lidských zdrojů
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Celkové platby
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial Nos Požadováno pro serializovaném bodu {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Zápas platby fakturami
@@ -5923,6 +5950,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Získejte suroviny pro výrobu
 DocType: Job Opening,Job Title,Název pozice
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Budoucí platba Ref
+DocType: Quotation,Additional Discount and Coupon Code,Další slevový a kuponový kód
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} znamená, že {1} neposkytne citát, ale byly citovány všechny položky \. Aktualizace stavu nabídky RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maximální vzorky - {0} již byly zadány v dávce {1} a položce {2} v dávce {3}.
@@ -6150,7 +6178,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Nastavení titulní stránce webu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} je podržen do {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs nejsou povoleny pro {0} kvůli stavu scorecard {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Proveďte nákupní faktury
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Použité listy
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Použitý kupón je {1}. Povolené množství je vyčerpáno
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Chcete odeslat materiální žádost
 DocType: Job Offer,Awaiting Response,Čeká odpověď
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6164,6 +6194,7 @@
 DocType: Training Event Employee,Optional,Volitelný
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 DocType: Agriculture Analysis Criteria,Water Analysis,Analýza vody
+DocType: Sales Order,Skip Delivery Note,Přeskočit dodací list
 DocType: Price List,Price Not UOM Dependent,Cena není závislá na UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,Vytvořeny varianty {0}.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Výchozí dohoda o úrovni služeb již existuje.
@@ -6268,6 +6299,7 @@
 DocType: Vehicle,Last Carbon Check,Poslední Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Výdaje na právní služby
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Vyberte množství v řadě
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Pracovní objednávka {0}: pracovní list nebyl nalezen pro operaci {1}
 DocType: Purchase Invoice,Posting Time,Čas zadání
 DocType: Timesheet,% Amount Billed,% Fakturované částky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefonní Náklady
@@ -6370,7 +6402,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový řádek {0}: Další datum odpisování nemůže být před datem k dispozici
 ,Sales Funnel,Prodej Nálevka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Vozík
@@ -6466,6 +6497,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",Věrnostní body budou vypočteny z vynaložených výdajů (prostřednictvím faktury k prodeji) na základě zmíněného faktoru sběru.
 DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
+DocType: Pricing Rule,Coupon Code Based,Kód založený na kupónu
 DocType: Company,HRA Settings,Nastavení HRA
 DocType: Homepage,Hero Section,Hero Section
 DocType: Employee Transfer,Transfer Date,Datum přenosu
@@ -6581,6 +6613,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Nastavte filtr společnosti prázdný, pokud je Skupina By je &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Vysílání datum nemůže být budoucí datum
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Řádek # {0}: Výrobní číslo {1} neodpovídá {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Číslovací řady
 DocType: Stock Entry,Target Warehouse Address,Cílová adresa skladu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Casual Leave
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Čas před začátkem směny, během kterého je za účast považováno přihlášení zaměstnanců."
@@ -6615,7 +6648,6 @@
 DocType: Employee Grade,Employee Grade,Pracovní zařazení
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Úkolová práce
 DocType: GSTR 3B Report,June,červen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Share Balance,From No,Od č
 DocType: Shift Type,Early Exit Grace Period,Časné ukončení odkladu
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
@@ -6900,7 +6932,6 @@
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Dohoda o úrovni služeb s typem entity {0} a entitou {1} již existuje.
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
 DocType: BOM,Rate Of Materials Based On,Ocenění materiálů na bázi
@@ -7038,6 +7069,7 @@
 DocType: Budget,Warn,Varovat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Všechny položky byly již převedeny pro tuto pracovní objednávku.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
+DocType: Bank Account,Company Account,Firemní účet
 DocType: Asset Maintenance,Manufacturing User,Výroba Uživatel
 DocType: Purchase Invoice,Raw Materials Supplied,Dodává suroviny
 DocType: Subscription Plan,Payment Plan,Platebni plan
@@ -7079,6 +7111,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nemůže být větší než plánované množství ({2}) v pracovní objednávce {3}
 DocType: Certification Application,Name of Applicant,Jméno žadatele
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Čas list pro výrobu.
+DocType: Quick Stock Balance,Quick Stock Balance,Rychlá bilance zásob
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,mezisoučet
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,"Vlastnosti Variantu nelze změnit po transakci akcií. Budete muset vytvořit novou položku, abyste to udělali."
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA mandát
@@ -7405,6 +7438,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Prosím nastavte {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivní student
 DocType: Employee,Health Details,Zdravotní Podrobnosti
+DocType: Coupon Code,Coupon Type,Typ kupónu
 DocType: Leave Encashment,Encashable days,Dny zapamatovatelné
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,"Chcete-li vytvořit referenční dokument žádosti o platbu, je třeba"
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7688,6 +7722,7 @@
 DocType: Hotel Room Package,Amenities,Vybavení
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Automaticky načíst platební podmínky
 DocType: QuickBooks Migrator,Undeposited Funds Account,Účet neukladaných prostředků
+DocType: Coupon Code,Uses,Použití
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Vícenásobný výchozí způsob platby není povolen
 DocType: Sales Invoice,Loyalty Points Redemption,Věrnostní body Vykoupení
 ,Appointment Analytics,Aplikace Analytics
@@ -7704,6 +7739,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Celkový rozpočet
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Nechte prázdné, pokud rodíte studentské skupiny ročně"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Pokud je zaškrtnuto, Total no. pracovních dnů bude zahrnovat dovolenou, a to sníží hodnotu platu za každý den"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Nepodařilo se přidat doménu
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Chcete-li povolit příjem / doručení, aktualizujte položku „Příjem / příjem“ v Nastavení skladu nebo v položce."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Aplikace s použitím aktuálního klíče nebudou mít přístup, jste si jisti?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7716,6 +7752,7 @@
 ,BOM Stock Report,BOM Sklad Zpráva
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Pokud není přiřazen žádný časový interval, bude komunikace probíhat touto skupinou"
 DocType: Stock Reconciliation Item,Quantity Difference,množství Rozdíl
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 ,Electronic Invoice Register,Elektronický fakturační registr
@@ -7969,6 +8006,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Daně a poplatky odečteny (Company měna)
 DocType: Item Group,General Settings,Obecné nastavení
 DocType: Article,Article,Článek
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Zadejte kód kupónu !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Z měny a měny nemůže být stejné
 DocType: Taxable Salary Slab,Percent Deduction,Procentní odpočet
 DocType: GL Entry,To Rename,Přejmenovat
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 4f7b189..0120e3c 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundeservicekontakt
 DocType: Shift Type,Enable Auto Attendance,Aktivér automatisk deltagelse
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Indtast venligst lager og dato
 DocType: Lost Reason Detail,Opportunity Lost Reason,Mulighed mistet grund
 DocType: Patient Appointment,Check availability,Tjek tilgængelighed
 DocType: Retention Bonus,Bonus Payment Date,Bonus Betalingsdato
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Afsluttede arbejdsordrer
 DocType: Support Settings,Forum Posts,Forumindlæg
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Opgaven er valgt som et baggrundsjob. I tilfælde af, at der er noget problem med behandling i baggrunden, tilføjer systemet en kommentar om fejlen i denne aktieafstemning og vender tilbage til udkastet."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Beklager, gyldigheden af kuponkoden er ikke startet"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Skattepligtigt beløb
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Forlad politikoplysninger
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Forbrugsmaterialer
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Grad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 DocType: Restaurant Table,No of Seats,Ingen pladser
 DocType: Sales Invoice,Overdue and Discounted,Forfaldne og nedsatte
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Opkald frakoblet
@@ -506,6 +509,7 @@
 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,No description given,Ingen beskrivelse
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Hent genstande fra lageret
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Indkøbsanmodning.
 DocType: POS Closing Voucher Details,Collected Amount,Samlet beløb
 DocType: Lab Test,Submitted Date,Indsendt dato
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Hjælp
 ,Trial Balance (Simple),Testbalance (enkel)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Aktivér udskudt udgift
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Anvendt kuponkode
 DocType: Asset,Next Depreciation Date,Næste afskrivningsdato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Arbejdsordre
 DocType: Sales Invoice,Total Qty,Antal i alt
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 DocType: Item,Show in Website (Variant),Vis på hjemmesiden (Variant)
 DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
 DocType: Payroll Entry,Select Payroll Period,Vælg Lønperiode
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Skat tilbageholdende konto
 DocType: Pricing Rule,Sales Partner,Forhandler
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Alle leverandør scorecards.
+DocType: Coupon Code,To be used to get discount,Bruges til at få rabat
 DocType: Buying Settings,Purchase Receipt Required,Købskvittering påkrævet
 DocType: Sales Invoice,Rail,Rail
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Faktiske omkostninger
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Åbning af fakturaoprettelsesværktøj
 DocType: Salary Component,Round to the Nearest Integer,Rund til det nærmeste heltal
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Tillad, at varer, der ikke er på lager, lægges i indkøbskurven"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Salg Return
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Indstil antal i transaktioner baseret på serienummerindgang
 ,Total Stock Summary,Samlet lageroversigt
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basistimesats (firmavaluta)
 ,Qty To Be Billed,"Antal, der skal faktureres"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Leveres Beløb
+DocType: Coupon Code,Gift Card,Gavekort
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reserveret antal til produktion: Råvaremængde til fremstilling af produktionsartikler.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Indløsningsdato
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Denne banktransaktion er allerede fuldt afstemt
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Opret timeseddel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Køb fakturaer
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Du kan kun forny, hvis dit medlemskab udløber inden for 30 dage"
 DocType: Shopping Cart Settings,Show Stock Availability,Vis lager tilgængelighed
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Indstil {0} i aktivkategori {1} eller firma {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserveret antal: Mængde bestilt til salg, men ikke leveret."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vælg igen, hvis den valgte adresse redigeres efter gem"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Reserveret antal til underentreprise: Råvaremængde til fremstilling af underleverede genstande.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reserveret antal til underentreprise: Råvaremængde til fremstilling af underleverede genstande.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 DocType: Item,Hub Publishing Details,Hub Publishing Detaljer
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','Åbner'
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Import af varer og UOM&#39;er
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lånebeløb
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Tilføjet til detaljer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Beklager, kuponkoden er opbrugt"
 DocType: Communication Medium,Catch All,Fang alle
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Kursusskema
 DocType: Budget,Applicable on Material Request,Gælder for materialeanmodning
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ugyldig Attribut
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} skal godkendes
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-mail-kampagner
+DocType: Sales Partner,To Track inbound purchase,For at spore indgående køb
 DocType: Buying Settings,Default Supplier Group,Standardleverandørgruppe
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},"Maksimumsbeløb, der er berettiget til komponenten {0}, overstiger {1}"
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Foretag lagerindtastning
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruger
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Indstil status
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Indstil nummerserier for deltagelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vælg venligst præfiks først
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Opfyldelsesfrist
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,I nærheden af dig
 DocType: Student,O-,O-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Under gennemsyn
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Kunne ikke logge ind
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Aktiv {0} oprettet
+DocType: Coupon Code,Promotional,Salgsfremmende
 DocType: Special Test Items,Special Test Items,Særlige testelementer
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Du skal være en bruger med System Manager og Item Manager roller til at registrere på Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Nøglerapporter
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
 DocType: Subscription Plan,Billing Interval Count,Faktureringsintervaltælling
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Aftaler og patientmøder
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Værdi mangler
 DocType: Employee,Department and Grade,Afdeling og Grad
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Start- og slutdato
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Kontraktskabelopfyldelsesbetingelser
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
+DocType: Coupon Code,Maximum Use,Maksimal brug
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Åben stykliste {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for serienummeret
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,Inventory
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Download som Json
 DocType: Item,Sales Details,Salg Detaljer
+DocType: Coupon Code,Used,Brugt
 DocType: Opportunity,With Items,Med varer
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampagnen &#39;{0}&#39; findes allerede for {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Vedligeholdelse Team
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",Ingen aktiv BOM fundet for punkt {0}. Levering med \ Serienummer kan ikke sikres
 DocType: Sales Partner,Sales Partner Target,Forhandlermål
 DocType: Loan Type,Maximum Loan Amount,Maksimalt lånebeløb
-DocType: Pricing Rule,Pricing Rule,Prisfastsættelsesregel
+DocType: Coupon Code,Pricing Rule,Prisfastsættelsesregel
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materialeanmodning til indkøbsordre
 DocType: Company,Default Selling Terms,Standard salgsbetingelser
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,Betaling Beløb
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Halvdagsdato skal være mellem arbejde fra dato og arbejdsdato
 DocType: Healthcare Settings,Healthcare Service Items,Sundhedsydelser
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Ugyldig stregkode. Der er ingen ting knyttet til denne stregkode.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Nettoændring i kontanter
 DocType: Assessment Plan,Grading Scale,karakterbekendtgørelsen
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Aktiver konto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Ny udgivelsesdato skulle være i fremtiden
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; HR-indstillinger
 DocType: Lab Test,Technician Name,Tekniker navn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3003,6 +3017,7 @@
 DocType: Products Settings,Hide Variants,Skjul varianter
 DocType: Lead,Next Contact By,Næste kontakt af
 DocType: Compensatory Leave Request,Compensatory Leave Request,Kompenserende Forladelsesanmodning
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Kan ikke overbillede for vare {0} i række {1} mere end {2}. For at tillade overfakturering skal du angive kvote i Kontoindstillinger
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},"Mængde, der kræves for Item {0} i række {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kan ikke slettes, da der eksisterer et antal varer {1} på lageret"
 DocType: Blanket Order,Order Type,Bestil Type
@@ -3172,7 +3187,6 @@
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
 DocType: Employee Benefit Claim,Claim Benefit For,Claim fordele for
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Kan ikke overbillet for vare {0} i række {1} mere end {2}. For at tillade overfakturering, skal du angive lagerindstillinger"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Opdater svar
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3462,6 +3476,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Angiv venligst valuta i firmaet
 DocType: Workstation,Wages per hour,Timeløn
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurer {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materialeanmodninger er blevet dannet automatisk baseret på varens genbestillelsesniveau
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
@@ -3791,6 +3806,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Godkend lønseddel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,I venteposition
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Et spørgsmål skal have mindst én korrekte indstillinger
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Indkøbsordre
 DocType: Account,Inter Company Account,Inter Company Account
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse & kontaktpersoner
@@ -3801,6 +3817,7 @@
 DocType: POS Profile,[Select],[Vælg]
 DocType: Staffing Plan Detail,Number Of Positions,Antal positioner
 DocType: Vital Signs,Blood Pressure (diastolic),Blodtryk (diastolisk)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Vælg kunden.
 DocType: SMS Log,Sent To,Sendt Til
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Opret salgsfaktura
@@ -4010,7 +4027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} er ikke godkendt
 DocType: Subscription,Trialling,afprøvning
 DocType: Sales Invoice Item,Deferred Revenue,Udskudte indtægter
-DocType: Bank Account,GL Account,GL-konto
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Kontantkonto bruges til oprettelse af salgsfaktura
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Fritagelsesunderkategori
 DocType: Member,Membership Expiry Date,Medlemskabets udløbsdato
@@ -4414,13 +4430,13 @@
 DocType: C-Form Invoice Detail,Territory,Område
 DocType: Pricing Rule,Apply Rule On Item Code,Anvend regel om varekode
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Aktiebalancerapport
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Betaling
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Vis kumulativ mængde
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Opdatering i gang. Det kan tage et stykke tid.
 DocType: Production Plan Item,Produced Qty,Produceret antal
 DocType: Vehicle Log,Fuel Qty,Brændstofmængde
-DocType: Stock Entry,Target Warehouse Name,Mållagernavn
 DocType: Work Order Operation,Planned Start Time,Planlagt starttime
 DocType: Course,Assessment,Vurdering
 DocType: Payment Entry Reference,Allocated,Tildelt
@@ -4486,10 +4502,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Standardvilkår og -betingelser, der kan føjes til salg og køb. Eksempler: 1. gyldighed for tilbuddet. 1. Betalingsbetingelser (på forhånd, på kredit, delvist på forhånd osv). 1. Hvad er ekstra (eller skal betales af kunden). 1. Sikkerhed / forbrugerinformation. 1. Garanti (hvis nogen). 1. Returpolitik. 1. Betingelser for skibsfart (hvis relevant). 1. Håndtering af tvister, erstatning, ansvar mv 1. Adresse og kontakt i din virksomhed."
 DocType: Homepage Section,Section Based On,Sektion baseret på
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Vis Anvend kuponkode
 DocType: Issue,Issue Type,Udstedelsestype
 DocType: Attendance,Leave Type,Fraværstype
 DocType: Purchase Invoice,Supplier Invoice Details,Leverandør fakturadetaljer
 DocType: Agriculture Task,Ignore holidays,Ignorer ferie
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Tilføj / rediger kuponbetingelser
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Udgifts- differencekonto ({0}) skal være en resultatskonto
 DocType: Stock Entry Detail,Stock Entry Child,Lagerindgangsbarn
 DocType: Project,Copied From,Kopieret fra
@@ -4664,6 +4682,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vurdering Plan Kriterier
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transaktioner
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Forhindre indkøbsordrer
+DocType: Coupon Code,Coupon Name,Kuponnavn
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,modtagelig
 DocType: Email Campaign,Scheduled,Planlagt
 DocType: Shift Type,Working Hours Calculation Based On,Beregning af arbejdstid baseret på
@@ -4680,7 +4699,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Opret Varianter
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Prisliste Valuta ikke valgt
+DocType: Quick Stock Balance,Available Quantity,Tilgængeligt antal
 DocType: Purchase Invoice,Availed ITC Cess,Benyttet ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Opsæt instruktør navngivningssystem i uddannelse&gt; Uddannelsesindstillinger
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Forsendelsesregel gælder kun for salg
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskrivningsrække {0}: Næste afskrivningsdato kan ikke være før købsdato
@@ -4747,8 +4768,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 DocType: Quality Meeting,Quality Meeting,Kvalitetsmøde
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ikke-gruppe til gruppe
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNæste bruger
+DocType: Coupon Code,Coupon Description,Kuponbeskrivelse
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Parti er obligatorisk i række {0}
 DocType: Company,Default Buying Terms,Standard købsbetingelser
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Købskvittering leveret vare
@@ -4911,6 +4932,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Imod Dokument Detalje Nr.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Sletning er ikke tilladt for land {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Selskabstypen er obligatorisk
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Anvend kuponkode
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",For jobkort {0} kan du kun foretage lagerstatus &#39;Materialeoverførsel til fremstilling&#39;
 DocType: Quality Inspection,Outgoing,Udgående
 DocType: Customer Feedback Table,Customer Feedback Table,Tabel om kundefeedback
@@ -5060,7 +5082,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ved levering af indkøbsordre
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tilføj alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allokeret beløb kan ikke være større end udestående beløb.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tally Migration,Parties,parterne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Gennemse styklister
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Sikrede lån
@@ -5092,7 +5113,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tillad ikke at indstille alternativt element til varen {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datoen er gentaget
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Tegningsberettiget
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Opsæt instruktør navngivningssystem i uddannelse&gt; Uddannelsesindstillinger
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC tilgængelig (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Opret gebyrer
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
@@ -5117,6 +5137,7 @@
 DocType: Quiz Result,Wrong,Forkert
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (firmavaluta)
+DocType: Sales Partner,Referral Code,Henvisningskode
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Samlet forskudsbeløb kan ikke være større end det samlede sanktionerede beløb
 DocType: Salary Slip,Hour Rate,Timesats
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Aktivér automatisk ombestilling
@@ -5245,6 +5266,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Vis lager Antal
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Netto kontant fra drift
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Række nr. {0}: Status skal være {1} for fakturaborting {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {1}) ikke fundet for varen: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Vare 4
 DocType: Student Admission,Admission End Date,Optagelse Slutdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Underleverandører
@@ -5267,6 +5289,7 @@
 DocType: Travel Request,Fully Sponsored,Fuldt sponsoreret
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Opret jobkort
+DocType: Quotation,Referral Sales Partner,Henvisning Salgspartner
 DocType: Quality Procedure Process,Process Description,Procesbeskrivelse
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Kunden {0} er oprettet.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Der er i øjeblikket ingen lager på lageret
@@ -5401,6 +5424,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Læsning af uploadet fil
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Stoppet Arbejdsordre kan ikke annulleres, Unstop det først for at annullere"
+DocType: Coupon Code,Coupon Code,Kuponkode
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Træk varene fra følgeseddel
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Række {0}: vælg arbejdsstationen imod operationen {1}
@@ -5483,6 +5507,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Dato&#39; er påkrævet
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Dataind- og udlæsning
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Beklager, gyldigheden af kuponkoden er udløbet"
 DocType: Bank Account,Account Details,konto detaljer
 DocType: Crop,Materials Required,Materialer krævet
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Ingen studerende Fundet
@@ -5520,6 +5545,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Gå til Brugere
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,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,{0} is not a valid Batch Number for Item {1},{0} er ikke et gyldigt partinummer for vare {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Indtast en gyldig kuponkode !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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: Task,Task Description,Opgavebeskrivelse
 DocType: Training Event,Seminar,Seminar
@@ -5784,6 +5810,7 @@
 ,TDS Payable Monthly,TDS betales månedligt
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Kø for at erstatte BOM. Det kan tage et par minutter.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,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/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; HR-indstillinger
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Samlede betalinger
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serienummer påkrævet for serienummervare {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Match betalinger med fakturaer
@@ -5873,6 +5900,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Få råmaterialer til produktion
 DocType: Job Opening,Job Title,Titel
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Fremtidig betaling Ref
+DocType: Quotation,Additional Discount and Coupon Code,Yderligere rabat- og kuponkode
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indikerer at {1} ikke giver et citat, men alle elementer \ er blevet citeret. Opdatering af RFQ citat status."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maksimale prøver - {0} er allerede bevaret for Batch {1} og Item {2} i Batch {3}.
@@ -6100,7 +6128,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Indstillinger for hjemmesidens startside
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} er på vent indtil {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ&#39;er er ikke tilladt for {0} på grund af et scorecard stående på {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Make købsfaktura
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Brugte blade
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Brugt kupon er {1}. Den tilladte mængde er opbrugt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Ønsker du at indsende den materielle anmodning
 DocType: Job Offer,Awaiting Response,Afventer svar
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6114,6 +6144,7 @@
 DocType: Training Event Employee,Optional,Valgfri
 DocType: Salary Slip,Earning & Deduction,Tillæg & fradrag
 DocType: Agriculture Analysis Criteria,Water Analysis,Vandanalyse
+DocType: Sales Order,Skip Delivery Note,Spring over leveringsnotat
 DocType: Price List,Price Not UOM Dependent,Pris ikke UOM-afhængig
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} varianter oprettet.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,En standard serviceniveauaftale findes allerede.
@@ -6218,6 +6249,7 @@
 DocType: Vehicle,Last Carbon Check,Sidste synsdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Advokatudgifter
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Vælg venligst antal på række
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Arbejdsordre {0}: jobkort findes ikke til operationen {1}
 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_with_account_number.py,Telephone Expenses,Telefonudgifter
@@ -6320,7 +6352,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskrivnings række {0}: Næste afskrivningsdato kan ikke være før tilgængelig dato
 ,Sales Funnel,Salgstragt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Opgave-fremskridt
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kurv
@@ -6415,6 +6446,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Loyalitetspoint beregnes ud fra det brugte udbytte (via salgsfakturaen), baseret på den nævnte indsamlingsfaktor."
 DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
+DocType: Pricing Rule,Coupon Code Based,Baseret på kuponkode
 DocType: Company,HRA Settings,HRA-indstillinger
 DocType: Homepage,Hero Section,Heltesektion
 DocType: Employee Transfer,Transfer Date,Overførselsdato
@@ -6530,6 +6562,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Indstil Firmafilter blankt, hvis Group By er &#39;Company&#39;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Indstil nummerserier for deltagelse via Opsætning&gt; Nummereringsserie
 DocType: Stock Entry,Target Warehouse Address,Mållagerhusadresse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Casual Leave
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Tiden før skiftets starttid, hvor medarbejderindtjekning overvejes til deltagelse."
@@ -6564,7 +6597,6 @@
 DocType: Employee Grade,Employee Grade,Medarbejderklasse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akkordarbejde
 DocType: GSTR 3B Report,June,juni
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Share Balance,From No,Fra nr
 DocType: Shift Type,Early Exit Grace Period,Tidlig afgangsperiode
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
@@ -6849,7 +6881,6 @@
 DocType: Warehouse,Warehouse Name,Lagernavn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {1}) ikke fundet for varen: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Serviceniveauaftale med entitetstype {0} og enhed {1} findes allerede.
 DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
@@ -6987,6 +7018,7 @@
 DocType: Budget,Warn,Advar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Alle elementer er allerede overført til denne Arbejdsordre.
 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: Bank Account,Company Account,Firmakonto
 DocType: Asset Maintenance,Manufacturing User,Produktionsbruger
 DocType: Purchase Invoice,Raw Materials Supplied,Leverede råvarer
 DocType: Subscription Plan,Payment Plan,Betalingsplan
@@ -7028,6 +7060,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) kan ikke være større end den planlagte mængde ({2}) i Work Order {3}
 DocType: Certification Application,Name of Applicant,Ansøgerens navn
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Tidsregistrering til Produktion.
+DocType: Quick Stock Balance,Quick Stock Balance,Hurtig lagerbalance
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Subtotal
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Kan ikke ændre Variantegenskaber efter aktiehandel. Du bliver nødt til at lave en ny vare til at gøre dette.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA Mandat
@@ -7354,6 +7387,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Indstil {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} er inaktiv studerende
 DocType: Employee,Health Details,Sundhedsdetaljer
+DocType: Coupon Code,Coupon Type,Kupon type
 DocType: Leave Encashment,Encashable days,Encashable dage
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,For at oprette en betalingsanmodning kræves referencedokument
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7636,6 +7670,7 @@
 DocType: Hotel Room Package,Amenities,Faciliteter
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Hent automatisk betalingsbetingelser
 DocType: QuickBooks Migrator,Undeposited Funds Account,Undeposited Funds Account
+DocType: Coupon Code,Uses,Anvendelser
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Flere standard betalingsmåder er ikke tilladt
 DocType: Sales Invoice,Loyalty Points Redemption,Loyalitetspoint Indfrielse
 ,Appointment Analytics,Aftale Analytics
@@ -7652,6 +7687,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Samlet budget
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lad feltet stå tomt, hvis du laver elevergrupper hvert år"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Kunne ikke tilføje domæne
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",For at tillade overmodtagelse / levering skal du opdatere &quot;Overmodtagelse / leveringstilladelse&quot; i lagerindstillinger eller varen.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Apps, der bruger den nuværende nøgle, vil ikke kunne få adgang til, er du sikker?"
 DocType: Subscription Settings,Prorate,prorate
@@ -7664,6 +7700,7 @@
 ,BOM Stock Report,BOM Stock Rapport
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Hvis der ikke er tildelt timeslot, håndteres kommunikation af denne gruppe"
 DocType: Stock Reconciliation Item,Quantity Difference,Mængdeforskel
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Kreditbeløb
 ,Electronic Invoice Register,Elektronisk fakturaregister
@@ -7917,6 +7954,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skatter og Afgifter Fratrukket (Company Valuta)
 DocType: Item Group,General Settings,Generelle indstillinger
 DocType: Article,Article,Genstand
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Indtast kuponkode !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Fra Valuta og Til valuta ikke kan være samme
 DocType: Taxable Salary Slab,Percent Deduction,Procent Fradrag
 DocType: GL Entry,To Rename,At omdøbe
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 297da9f..2e25a12 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kundenkontakt
 DocType: Shift Type,Enable Auto Attendance,Automatische Teilnahme aktivieren
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Bitte geben Sie Lager und Datum ein
 DocType: Lost Reason Detail,Opportunity Lost Reason,Verlorene Gelegenheitsgründe
 DocType: Patient Appointment,Check availability,Verfügbarkeit prüfen
 DocType: Retention Bonus,Bonus Payment Date,Bonuszahlungsdatum
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Abgeschlossene Arbeitsaufträge
 DocType: Support Settings,Forum Posts,Forum Beiträge
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund Probleme auftreten, fügt das System einen Kommentar zum Fehler in dieser Bestandsabstimmung hinzu und kehrt zum Entwurfsstadium zurück"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",Die Gültigkeit des Gutscheincodes hat leider nicht begonnen
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Steuerpflichtiger Betrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: Leave Policy,Leave Policy Details,Urlaubsrichtliniendetails
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Verbrauchsgut
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Klasse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Restaurant Table,No of Seats,Anzahl der Sitze
 DocType: Sales Invoice,Overdue and Discounted,Überfällig und abgezinst
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Anruf getrennt
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Zeilenabstand für Betrag in Worten
 DocType: Vehicle,Additional Details,Weitere Details
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Keine Beschreibung angegeben
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Abrufen von Artikeln aus dem Lager
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Lieferantenanfrage
 DocType: POS Closing Voucher Details,Collected Amount,Gesammelte Menge
 DocType: Lab Test,Submitted Date,Eingeschriebenes Datum
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Lernen
 ,Trial Balance (Simple),Probebilanz (einfach)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Aktivieren Sie den Rechnungsabgrenzungsposten
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Angewandter Gutscheincode
 DocType: Asset,Next Depreciation Date,Nächstes Abschreibungsdatum
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktivitätskosten je Mitarbeiter
 DocType: Accounts Settings,Settings for Accounts,Konteneinstellungen
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Arbeitsauftrag
 DocType: Sales Invoice,Total Qty,Gesamtmenge
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-Mail-ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument zu stornieren"
 DocType: Item,Show in Website (Variant),Auf der Website anzeigen (Variante)
 DocType: Employee,Health Concerns,Gesundheitsfragen
 DocType: Payroll Entry,Select Payroll Period,Wählen Sie Abrechnungsperiode
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Steuerrückbehaltkonto
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Alle Lieferanten-Scorecards.
+DocType: Coupon Code,To be used to get discount,"Verwendet werden, um Rabatt zu bekommen"
 DocType: Buying Settings,Purchase Receipt Required,Kaufbeleg notwendig
 DocType: Sales Invoice,Rail,Schiene
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tatsächliche Kosten
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Öffnen des Rechnungserstellungswerkzeugs
 DocType: Salary Component,Round to the Nearest Integer,Runde auf die nächste Ganzzahl
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Artikel, die nicht auf Lager sind, können in den Warenkorb gelegt werden"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Rücklieferung
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Legen Sie Menge in Transaktionen basierend auf Serial No Input fest
 ,Total Stock Summary,Gesamt Stock Zusammenfassung
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basis Stundensatz (Unternehmenswährung)
 ,Qty To Be Billed,Abzurechnende Menge
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Gelieferte Menge
+DocType: Coupon Code,Gift Card,Geschenkkarte
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reservierte Menge für die Produktion: Rohstoffmenge zur Herstellung von Produktionsartikeln.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Rückzahlungsdatum
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Diese Banküberweisung ist bereits vollständig abgeglichen
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Arbeitszeittabelle erstellen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Rechnungen kaufen
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Sie können nur verlängern, wenn Ihre Mitgliedschaft innerhalb von 30 Tagen abläuft"
 DocType: Shopping Cart Settings,Show Stock Availability,Bestandsverfügbarkeit anzeigen
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Legen Sie {0} in der Anlagekategorie {1} oder in Unternehmen {2} fest.
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservierte Menge: Für den Verkauf bestellte Menge, aber noch nicht geliefert."
 DocType: Drug Prescription,Interval UOM,Intervall UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Wählen Sie erneut, wenn die gewählte Adresse nach dem Speichern bearbeitet wird"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Reservierte Menge für Lohnbearbeiter: Rohstoffmenge für Lohnbearbeiter.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Reservierte Menge für Lohnbearbeiter: Rohstoffmenge für Lohnbearbeiter.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 DocType: Item,Hub Publishing Details,Hub-Veröffentlichungsdetails
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',"""Eröffnung"""
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Importieren von Artikeln und Mengeneinheiten
 DocType: Repayment Schedule,Balance Loan Amount,Bilanz Darlehensbetrag
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Zu Details hinzugefügt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",Der Gutscheincode ist leider erschöpft
 DocType: Communication Medium,Catch All,Fang alle
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Unterrichtszeiten
 DocType: Budget,Applicable on Material Request,Anwendbar auf Materialanforderung
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ungültige Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-Mail-Kampagnen
+DocType: Sales Partner,To Track inbound purchase,Um eingehende Einkäufe zu verfolgen
 DocType: Buying Settings,Default Supplier Group,Standardlieferantengruppe
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Menge muss kleiner oder gleich {0} sein
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Der für die Komponente {0} zulässige Höchstbetrag übersteigt {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Bestandserfassung vornehmen
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservierung Benutzer
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Status setzen
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Bitte zuerst Präfix auswählen
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 DocType: Contract,Fulfilment Deadline,Erfüllungsfrist
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Nahe bei dir
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,Unter Überprüfung
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Einloggen fehlgeschlagen
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Vermögenswert {0} erstellt.
+DocType: Coupon Code,Promotional,Werbeartikel
 DocType: Special Test Items,Special Test Items,Spezielle Testartikel
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sie müssen ein Benutzer mit System Manager- und Element-Manager-Rollen sein, um sich auf Marketplace registrieren zu können."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Wichtige Berichte
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Dokumententyp
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
 DocType: Subscription Plan,Billing Interval Count,Abrechnungsintervall Anzahl
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument abzubrechen"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Termine und Patienten-Begegnungen
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Fehlender Wert
 DocType: Employee,Department and Grade,Abteilung und Klasse
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Start- und Enddatum
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Bedingungen für Vertragsvorlagen-Erfüllung
 ,Delivered Items To Be Billed,"Gelieferte Artikel, die abgerechnet werden müssen"
+DocType: Coupon Code,Maximum Use,Maximale Nutzung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Stückliste {0} öffnen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Lager kann für Seriennummer nicht geändert werden
 DocType: Authorization Rule,Average Discount,Durchschnittlicher Rabatt
@@ -2584,6 +2597,7 @@
 DocType: Item,Inventory,Lagerbestand
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Als Json herunterladen
 DocType: Item,Sales Details,Verkaufsdetails
+DocType: Coupon Code,Used,Benutzt
 DocType: Opportunity,With Items,Mit Artikeln
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Die Kampagne &#39;{0}&#39; existiert bereits für die {1} &#39;{2}&#39;.
 DocType: Asset Maintenance,Maintenance Team,Wartungs Team
@@ -2713,7 +2727,7 @@
 						Serial No cannot be ensured",Für die Position {0} wurde keine aktive Stückliste gefunden. Die Lieferung per \ Seriennummer kann nicht gewährleistet werden
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 DocType: Loan Type,Maximum Loan Amount,Maximaler Darlehensbetrag
-DocType: Pricing Rule,Pricing Rule,Preisregel
+DocType: Coupon Code,Pricing Rule,Preisregel
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplikat Rollennummer für den Schüler {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
 DocType: Company,Default Selling Terms,Standardverkaufsbedingungen
@@ -2792,6 +2806,7 @@
 DocType: Payment Schedule,Payment Amount,Zahlungsbetrag
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Das Halbtagesdatum sollte zwischen Arbeitstag und Enddatum liegen
 DocType: Healthcare Settings,Healthcare Service Items,Healthcare Service Artikel
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Ungültiger Barcode. Es ist kein Artikel an diesen Barcode angehängt.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Assessment Plan,Grading Scale,Bewertungsskala
@@ -2911,7 +2926,6 @@
 DocType: Share Transfer,Asset Account,Anlagenkonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Das neue Erscheinungsdatum sollte in der Zukunft liegen
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 DocType: Lab Test,Technician Name,Techniker Name
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3022,6 +3036,7 @@
 DocType: Products Settings,Hide Variants,Varianten ausblenden
 DocType: Lead,Next Contact By,Nächster Kontakt durch
 DocType: Compensatory Leave Request,Compensatory Leave Request,Ausgleichsurlaubsantrag
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Artikel {0} in Zeile {1} kann nicht mehr als {2} in Rechnung gestellt werden. Um eine Überberechnung zuzulassen, legen Sie die Überberechnung in den Kontoeinstellungen fest"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Für Artikel {0} in Zeile {1} benötigte Menge
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kann nicht gelöscht werden, da noch ein Bestand für Artikel {1} existiert"
 DocType: Blanket Order,Order Type,Bestellart
@@ -3191,7 +3206,6 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
 DocType: Employee Benefit Claim,Claim Benefit For,Anspruchsvorteil für
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Für Artikel {0} in Zeile {1} kann mehr als {2} nicht überbucht werden. Um Überfakturierung zu ermöglichen, legen Sie bitte in Stock Settings fest"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Antwort aktualisieren
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3481,6 +3495,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Bitte die Unternehmenswährung angeben
 DocType: Workstation,Wages per hour,Lohn pro Stunde
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},{0} konfigurieren
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Lagerbestand in Charge {0} wird für Artikel {2} im Lager {3} negativ {1}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
@@ -3810,6 +3825,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Gehaltsabrechnung übertragen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,In Wartestellung
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Eine Frage muss mindestens eine richtige Option haben
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Kauforder
 DocType: Account,Inter Company Account,Unternehmensübergreifendes Konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Mengenimport
 DocType: Sales Partner,Address & Contacts,Adresse & Kontaktinformationen
@@ -3820,6 +3836,7 @@
 DocType: POS Profile,[Select],[Auswählen]
 DocType: Staffing Plan Detail,Number Of Positions,Anzahl der Positionen
 DocType: Vital Signs,Blood Pressure (diastolic),Blutdruck (diastolisch)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Bitte wählen Sie den Kunden aus.
 DocType: SMS Log,Sent To,Gesendet An
 DocType: Agriculture Task,Holiday Management,Ferienmanagement
 DocType: Payment Request,Make Sales Invoice,Verkaufsrechnung erstellen
@@ -4028,7 +4045,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} wurde nicht übertragen
 DocType: Subscription,Trialling,Erprobung
 DocType: Sales Invoice Item,Deferred Revenue,Rechnungsabgrenzung
-DocType: Bank Account,GL Account,GL Konto
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Cash Account wird für die Erstellung von Verkaufsrechnungen verwendet
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Unterkategorie der Befreiung
 DocType: Member,Membership Expiry Date,Ablaufdatum der Mitgliedschaft
@@ -4452,13 +4468,13 @@
 DocType: C-Form Invoice Detail,Territory,Region
 DocType: Pricing Rule,Apply Rule On Item Code,Regel auf Artikelcode anwenden
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Bestandsbilanzbericht
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Gebühr
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Kumulativen Betrag anzeigen
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aktualisierung läuft. Es könnte eine Weile dauern.
 DocType: Production Plan Item,Produced Qty,Produzierte Menge
 DocType: Vehicle Log,Fuel Qty,Kraftstoff-Menge
-DocType: Stock Entry,Target Warehouse Name,Name des Ziellagers
 DocType: Work Order Operation,Planned Start Time,Geplante Startzeit
 DocType: Course,Assessment,Beurteilung
 DocType: Payment Entry Reference,Allocated,Zugewiesen
@@ -4536,10 +4552,12 @@
 8. Beschwerdemanagement, Schadensersatz, Haftung usw. 
 9. Adresse und Kontaktdaten des Unternehmens."
 DocType: Homepage Section,Section Based On,Abschnitt basierend auf
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Gutscheincode anwenden anzeigen
 DocType: Issue,Issue Type,Fehlertyp
 DocType: Attendance,Leave Type,Urlaubstyp
 DocType: Purchase Invoice,Supplier Invoice Details,Lieferant Rechnungsdetails
 DocType: Agriculture Task,Ignore holidays,Feiertage ignorieren
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Gutscheinbedingungen hinzufügen / bearbeiten
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Aufwands-/Differenz-Konto ({0}) muss ein ""Gewinn oder Verlust""-Konto sein"
 DocType: Stock Entry Detail,Stock Entry Child,Stock Entry Child
 DocType: Project,Copied From,Kopiert von
@@ -4714,6 +4732,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriterien des Beurteilungsplans
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transaktionen
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vermeidung von Bestellungen
+DocType: Coupon Code,Coupon Name,Gutschein Name
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Anfällig
 DocType: Email Campaign,Scheduled,Geplant
 DocType: Shift Type,Working Hours Calculation Based On,Arbeitszeitberechnung basierend auf
@@ -4730,7 +4749,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Varianten erstellen
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Preislistenwährung nicht ausgewählt
+DocType: Quick Stock Balance,Available Quantity,verfügbare Anzahl
 DocType: Purchase Invoice,Availed ITC Cess,Erreichte ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 ,Student Monthly Attendance Sheet,Schüler-Monatsanwesenheitsliste
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Versandregel gilt nur für den Verkauf
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Kaufdatum liegen
@@ -4797,8 +4818,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
 DocType: Quality Meeting,Quality Meeting,Qualitätstreffen
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group-Gruppe
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 DocType: Employee,ERPNext User,ERPNext Benutzer
+DocType: Coupon Code,Coupon Description,Coupon Beschreibung
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch ist obligatorisch in Zeile {0}
 DocType: Company,Default Buying Terms,Standard-Einkaufsbedingungen
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kaufbeleg-Artikel geliefert
@@ -4961,6 +4982,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Zu Dokumentendetail Nr.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Das Löschen ist für das Land {0} nicht zulässig.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Party-Typ ist Pflicht
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Gutscheincode anwenden
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Für die Jobkarte {0} können Sie nur die Bestandsbuchung vom Typ &#39;Materialtransfer für Fertigung&#39; vornehmen
 DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Customer Feedback Table,Customer Feedback Table,Kunden-Feedback-Tabelle
@@ -5110,7 +5132,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,On Purchase Order Submission
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Alle Lieferanten hinzufügen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile # {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Tally Migration,Parties,Parteien
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Gedeckte Kredite
@@ -5142,7 +5163,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},"Nicht zulassen, alternative Artikel für den Artikel {0} festzulegen"
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Zeichnungsberechtigte/-r
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Netto-ITC verfügbar (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Gebühren anlegen
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
@@ -5167,6 +5187,7 @@
 DocType: Quiz Result,Wrong,Falsch
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Kurs, zu dem die Währung der Preisliste in die Basiswährung des Kunden umgerechnet wird"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobetrag (Unternehmenswährung)
+DocType: Sales Partner,Referral Code,Referenzcode
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Der gesamte Vorschussbetrag darf nicht höher sein als der Gesamtbetrag der Sanktion
 DocType: Salary Slip,Hour Rate,Stundensatz
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Aktivieren Sie die automatische Nachbestellung
@@ -5295,6 +5316,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Bestandsmenge anzeigen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Nettocashflow aus laufender Geschäftstätigkeit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Zeile # {0}: Status muss {1} für Rechnungsrabatt {2} sein
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Artikel nicht gefunden: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Position 4
 DocType: Student Admission,Admission End Date,Stichtag für Zulassungsende
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Zulieferung
@@ -5317,6 +5339,7 @@
 DocType: Travel Request,Fully Sponsored,Vollständig gesponsert
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Journaleintrag umkehren
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Jobkarte erstellen
+DocType: Quotation,Referral Sales Partner,Empfehlungs-Vertriebspartner
 DocType: Quality Procedure Process,Process Description,Prozessbeschreibung
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Kunde {0} wird erstellt.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Derzeit ist kein Bestand in einem Lager verfügbar
@@ -5451,6 +5474,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Stückpreis
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Hochgeladene Datei lesen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Der angehaltene Arbeitsauftrag kann nicht abgebrochen werden. Stoppen Sie ihn zuerst, um ihn abzubrechen"
+DocType: Coupon Code,Coupon Code,Gutscheincode
 DocType: Asset,Journal Entry for Scrap,Journaleintrag für Ausschuss
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Bitte Artikel vom Lieferschein nehmen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Zeile {0}: Wählen Sie die Arbeitsstation für die Operation {1} aus.
@@ -5533,6 +5557,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Datum&#39; ist erforderlich
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Daten-Import und -Export
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",Die Gültigkeit des Gutscheincodes ist leider abgelaufen
 DocType: Bank Account,Account Details,Kontendaten
 DocType: Crop,Materials Required,Benötigte Materialien
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Keine Studenten gefunden
@@ -5570,6 +5595,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Gehen Sie zu den Benutzern
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Summe aus gezahltem Betrag + ausgebuchter Betrag darf nicht größer der Gesamtsumme sein
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ist keine gültige Chargennummer für Artikel {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Bitte geben Sie einen gültigen Gutscheincode ein !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Hinweis: Es gibt nicht genügend Urlaubsguthaben für Abwesenheitstyp {0}
 DocType: Task,Task Description,Aufgabenbeschreibung
 DocType: Training Event,Seminar,Seminar
@@ -5833,6 +5859,7 @@
 ,TDS Payable Monthly,TDS monatlich zahlbar
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,In Warteschlange zum Ersetzen der Stückliste. Dies kann einige Minuten dauern.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Abzug nicht möglich, wenn Kategorie ""Wertbestimmtung"" oder ""Wertbestimmung und Summe"" ist"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Gesamtzahlungen
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Seriennummern sind erforderlich für den Artikel mit Seriennummer {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Zahlungen und Rechnungen abgleichen
@@ -5922,6 +5949,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Holen Sie sich Rohstoffe für die Produktion
 DocType: Job Opening,Job Title,Stellenbezeichnung
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Zukünftige Zahlung
+DocType: Quotation,Additional Discount and Coupon Code,Zusätzlicher Rabatt und Gutscheincode
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} zeigt an, dass {1} kein Angebot anbieten wird, aber alle Items wurden zitiert. Aktualisieren des RFQ-Angebotsstatus."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maximum Samples - {0} wurden bereits für Batch {1} und Artikel {2} in Batch {3} gespeichert.
@@ -6149,7 +6177,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Einstellungen für die Internet-Homepage
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} ist zurückgestellt bis {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs sind nicht zulässig für {0} aufgrund einer Scorecard von {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Einkaufsrechnung erstellen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Genutzter Urlaub
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,Verwendeter {0} -Coupon ist {1}. Zulässige Menge ist erschöpft
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Möchten Sie die Materialanfrage einreichen?
 DocType: Job Offer,Awaiting Response,Warte auf Antwort
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6163,6 +6193,7 @@
 DocType: Training Event Employee,Optional,Optional
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 DocType: Agriculture Analysis Criteria,Water Analysis,Wasseranalyse
+DocType: Sales Order,Skip Delivery Note,Lieferschein überspringen
 DocType: Price List,Price Not UOM Dependent,Preis nicht UOM abhängig
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} Varianten erstellt.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Eine Standard-Service-Level-Vereinbarung ist bereits vorhanden.
@@ -6267,6 +6298,7 @@
 DocType: Vehicle,Last Carbon Check,Last Kohlenstoff prüfen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Rechtskosten
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Bitte wählen Sie die Menge aus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Fertigungsauftrag {0}: Auftragskarte für den Vorgang {1} nicht gefunden
 DocType: Purchase Invoice,Posting Time,Buchungszeit
 DocType: Timesheet,% Amount Billed,% des Betrages berechnet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefonkosten
@@ -6369,7 +6401,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen
 ,Sales Funnel,Verkaufstrichter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 DocType: Project,Task Progress,Vorgangsentwicklung
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Einkaufswagen
@@ -6464,6 +6495,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Treuepunkte werden aus dem ausgegebenen Betrag (über die Verkaufsrechnung) berechnet, basierend auf dem genannten Sammelfaktor."
 DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
+DocType: Pricing Rule,Coupon Code Based,Gutscheincode basiert
 DocType: Company,HRA Settings,HRA-Einstellungen
 DocType: Homepage,Hero Section,Helden-Sektion
 DocType: Employee Transfer,Transfer Date,Überweisungsdatum
@@ -6579,6 +6611,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Bitte den Filter ""Unternehmen"" leeren, wenn nach Unternehmen gruppiert wird"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Buchungsdatum kann nicht Datum in der Zukunft sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Zeile # {0}: Seriennummer {1} stimmt nicht mit {2} {3} überein
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 DocType: Stock Entry,Target Warehouse Address,Ziellageradresse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Erholungsurlaub
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Die Zeit vor dem Schichtbeginn, in der der Mitarbeiter-Check-in für die Anwesenheit berücksichtigt wird."
@@ -6613,7 +6646,6 @@
 DocType: Employee Grade,Employee Grade,Mitarbeiterklasse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akkordarbeit
 DocType: GSTR 3B Report,June,Juni
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Share Balance,From No,Von Nr
 DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Period
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
@@ -6896,7 +6928,6 @@
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Artikel nicht gefunden: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement mit Entitätstyp {0} und Entität {1} ist bereits vorhanden.
 DocType: Journal Entry,Write Off Entry,Abschreibungsbuchung
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
@@ -7034,6 +7065,7 @@
 DocType: Budget,Warn,Warnen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Alle Positionen wurden bereits für diesen Arbeitsauftrag übertragen.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
+DocType: Bank Account,Company Account,Firmenkonto
 DocType: Asset Maintenance,Manufacturing User,Nutzer Fertigung
 DocType: Purchase Invoice,Raw Materials Supplied,Gelieferte Rohmaterialien
 DocType: Subscription Plan,Payment Plan,Zahlungsplan
@@ -7075,6 +7107,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) darf nicht größer als die geplante Menge ({2}) im Arbeitsauftrag {3} sein
 DocType: Certification Application,Name of Applicant,Name des Bewerbers
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Zeitblatt für die Fertigung.
+DocType: Quick Stock Balance,Quick Stock Balance,Schneller Lagerbestand
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Zwischensumme
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Die Eigenschaften der Variante können nach der Buchung nicht mehr verändert werden. Hierzu muss ein neuer Artikel erstellt werden.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA-Mandat
@@ -7401,6 +7434,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Bitte {0} setzen
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ist ein inaktiver Schüler
 DocType: Employee,Health Details,Gesundheitsdaten
+DocType: Coupon Code,Coupon Type,Coupon-Typ
 DocType: Leave Encashment,Encashable days,Bezwingbare Tage
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Zur Erstellung eines Zahlungsauftrags ist ein Referenzdokument erforderlich
 DocType: Soil Texture,Sandy Clay,Sandiger Lehm
@@ -7684,6 +7718,7 @@
 DocType: Hotel Room Package,Amenities,Ausstattung
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Zahlungsbedingungen automatisch abrufen
 DocType: QuickBooks Migrator,Undeposited Funds Account,Konto für nicht eingezahlte Gelder
+DocType: Coupon Code,Uses,Verwendet
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Mehrere Standard-Zahlungsarten sind nicht erlaubt
 DocType: Sales Invoice,Loyalty Points Redemption,Treuepunkte-Einlösung
 ,Appointment Analytics,Terminanalytik
@@ -7700,6 +7735,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Gesamtbudget; Gesamtetat
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lassen Sie dies leer, wenn Sie Studentengruppen pro Jahr anlegen."
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Falls diese Option aktiviert ist, beinhaltet die Gesamtanzahl der Arbeitstage auch Feiertage und der Wert ""Gehalt pro Tag"" wird reduziert"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Fehler beim Hinzufügen der Domain
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Um eine Überbestätigung / Überlieferung zu ermöglichen, aktualisieren Sie &quot;Überbestätigung / Überlieferung&quot; in den Lagereinstellungen oder im Artikel."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Apps, die den aktuellen Schlüssel verwenden, werden den Zugriff verlieren. Trotzdem fortfahren?"
 DocType: Subscription Settings,Prorate,Prorieren
@@ -7712,6 +7748,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Wenn kein Zeitschlitz zugewiesen ist, wird die Kommunikation von dieser Gruppe behandelt"
 DocType: Stock Reconciliation Item,Quantity Difference,Mengendifferenz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 ,Electronic Invoice Register,Elektronisches Rechnungsregister
@@ -7965,6 +8002,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Steuern und Gebühren abgezogen (Unternehmenswährung)
 DocType: Item Group,General Settings,Grundeinstellungen
 DocType: Article,Article,Artikel
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Bitte Gutscheincode eingeben !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Von-Währung und Bis-Währung können nicht gleich sein
 DocType: Taxable Salary Slab,Percent Deduction,Prozentabzug
 DocType: GL Entry,To Rename,Umbenennen
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 5f460ef..3e641e1 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
 DocType: Shift Type,Enable Auto Attendance,Ενεργοποίηση αυτόματης παρακολούθησης
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Πληκτρολογήστε την Αποθήκη και την ημερομηνία
 DocType: Lost Reason Detail,Opportunity Lost Reason,Ευκαιρία χαμένος λόγος
 DocType: Patient Appointment,Check availability,Ελέγξτε διαθεσιμότητα
 DocType: Retention Bonus,Bonus Payment Date,Ημερομηνία πληρωμής μπόνους
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Ολοκληρωμένες Εντολές Εργασίας
 DocType: Support Settings,Forum Posts,Δημοσιεύσεις φόρουμ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Η εργασία έχει τεθεί ως εργασία υποβάθρου. Σε περίπτωση που υπάρχει θέμα επεξεργασίας στο παρασκήνιο, το σύστημα θα προσθέσει ένα σχόλιο σχετικά με το σφάλμα σε αυτήν την Συμφωνία Χρηματιστηρίου και θα επανέλθει στο στάδιο του Σχεδίου"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Λυπούμαστε, η εγκυρότητα του κωδικού κουπονιού δεν έχει ξεκινήσει"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Υποχρεωτικό ποσό
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: Leave Policy,Leave Policy Details,Αφήστε τα στοιχεία πολιτικής
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Αναλώσιμα
 DocType: Student,B-,ΣΙ-
 DocType: Assessment Result,Grade,Βαθμός
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Restaurant Table,No of Seats,Αριθμός καθισμάτων
 DocType: Sales Invoice,Overdue and Discounted,Καθυστερημένη και εκπτωτική
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Κλήση αποσυνδεδεμένο
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,διάστιχο για ποσό ολογράφως
 DocType: Vehicle,Additional Details,Επιπλέον Λεπτομέρειες
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Δεν έχει δοθεί περιγραφή
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Λήψη στοιχείων από την αποθήκη
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Αίτηση αγοράς.
 DocType: POS Closing Voucher Details,Collected Amount,Συγκεντρωμένο ποσό
 DocType: Lab Test,Submitted Date,Ημερομηνία υποβολής
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Μαθαίνω
 ,Trial Balance (Simple),Δοκιμαστικό υπόλοιπο (απλό)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Ενεργοποίηση αναβαλλόμενου εξόδου
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Κωδικός εφαρμοσμένου κουπονιού
 DocType: Asset,Next Depreciation Date,Επόμενο Ημερομηνία Αποσβέσεις
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Δραστηριότητα κόστος ανά εργαζόμενο
 DocType: Accounts Settings,Settings for Accounts,Ρυθμίσεις για τους λογαριασμούς
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Παραγγελία εργασίας
 DocType: Sales Invoice,Total Qty,Συνολική ποσότητα
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Όνομα ταυτότητας ηλεκτρονικού ταχυδρομείου Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 DocType: Item,Show in Website (Variant),Εμφάνιση στην ιστοσελίδα (Παραλλαγή)
 DocType: Employee,Health Concerns,Ανησυχίες για την υγεία
 DocType: Payroll Entry,Select Payroll Period,Επιλέξτε Περίοδο Μισθοδοσίας
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Λογαριασμός παρακράτησης φόρου
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Όλες οι scorecards του προμηθευτή.
+DocType: Coupon Code,To be used to get discount,Να χρησιμοποιηθούν για να λάβετε έκπτωση
 DocType: Buying Settings,Purchase Receipt Required,Απαιτείται αποδεικτικό παραλαβής αγοράς
 DocType: Sales Invoice,Rail,Ράγα
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Πραγματικό κόστος
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Σχέδιο παραγωγής
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Άνοιγμα εργαλείου δημιουργίας τιμολογίου
 DocType: Salary Component,Round to the Nearest Integer,Στρογγυλά στο πλησιέστερο ακέραιο
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Να επιτρέπεται η προσθήκη προϊόντων στο καλάθι
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Επιστροφή πωλήσεων
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Ορισμός ποσότητας στις συναλλαγές με βάση την αύξουσα σειρά εισόδου
 ,Total Stock Summary,Συνολική σύνοψη μετοχών
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Βάση ώρα Rate (Εταιρεία νομίσματος)
 ,Qty To Be Billed,Ποσότητα που χρεώνεται
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Ποσό που παραδόθηκε
+DocType: Coupon Code,Gift Card,Δωροκάρτα
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Ποσότητα εφοδιασμού για την παραγωγή: Ποσότητα πρώτων υλών για την κατασκευή ειδών κατασκευής.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Ημερομηνία Εξαγοράς
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Αυτή η τραπεζική συναλλαγή έχει ήδη συμφωνηθεί πλήρως
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Δημιουργία φύλλου εργασίας
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Αγορά τιμολογίων
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Μπορείτε να το ανανεώσετε μόνο αν λήξει η ιδιότητά σας εντός 30 ημερών
 DocType: Shopping Cart Settings,Show Stock Availability,Εμφάνιση διαθεσιμότητας αποθεμάτων
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Ορίστε {0} στην κατηγορία στοιχείων {1} ή στην εταιρεία {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",Δεσμευμένη ποσότητα : ποσότητα που παραγγέλθηκε για πώληση αλλά δεν παραδόθηκε.
 DocType: Drug Prescription,Interval UOM,Διαστήματα UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Επαναφέρετε την επιλογή, εάν η επιλεγμένη διεύθυνση επεξεργαστεί μετά την αποθήκευση"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Προβλεπόμενη ποσότητα για υπεργολαβία: Ποσότητα πρώτων υλών για την πραγματοποίηση υποκλάδων.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Προβλεπόμενη ποσότητα για υπεργολαβία: Ποσότητα πρώτων υλών για την πραγματοποίηση υποκλάδων.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 DocType: Item,Hub Publishing Details,Στοιχεία δημοσίευσης Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',«Άνοιγμα»
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Εισαγωγή στοιχείων και UOMs
 DocType: Repayment Schedule,Balance Loan Amount,Υπόλοιπο Ποσό Δανείου
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Προστέθηκαν στις λεπτομέρειες
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Λυπούμαστε, ο κωδικός κουπονιού εξαντλείται"
 DocType: Communication Medium,Catch All,Πιάστε όλα
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Μάθημα πρόγραμμα
 DocType: Budget,Applicable on Material Request,Ισχύει για Αίτηση υλικού
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Καμπάνιες ηλεκτρονικού ταχυδρομείου
+DocType: Sales Partner,To Track inbound purchase,Για την παρακολούθηση της εισερχόμενης αγοράς
 DocType: Buying Settings,Default Supplier Group,Προεπιλεγμένη ομάδα προμηθευτών
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Ποσότητα πρέπει να είναι μικρότερη ή ίση με {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Το μέγιστο ποσό που είναι επιλέξιμο για το στοιχείο {0} υπερβαίνει το {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Κάντε καταχώρηση αποθέματος
 DocType: Hotel Room Reservation,Hotel Reservation User,Χρήστης κράτησης ξενοδοχείων
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Ορισμός κατάστασης
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Προθεσμία εκπλήρωσης
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Κοντά σας
 DocType: Student,O-,Ο-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,Υπό εξέταση
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Αποτυχία σύνδεσης
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Το στοιχείο {0} δημιουργήθηκε
+DocType: Coupon Code,Promotional,Διαφήμιση
 DocType: Special Test Items,Special Test Items,Ειδικά στοιχεία δοκιμής
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Πρέπει να είστε χρήστης με ρόλους του Διαχειριστή Συστήματος και Στοιχεία διαχειριστή στοιχείων για να εγγραφείτε στο Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Αναφορές κλειδιών
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Τύπος εγγράφου
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
 DocType: Subscription Plan,Billing Interval Count,Χρονικό διάστημα χρέωσης
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Ραντεβού και συναντήσεων ασθενών
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Η αξία λείπει
 DocType: Employee,Department and Grade,Τμήμα και βαθμό
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Ημερομηνίες έναρξης και λήξης
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Όροι εκπλήρωσης προτύπου συμβολαίου
 ,Delivered Items To Be Billed,Είδη για χρέωση που έχουν παραδοθεί
+DocType: Coupon Code,Maximum Use,Μέγιστη χρήση
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Ανοίξτε το BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Η αποθήκη δεν μπορεί να αλλάξει για τον σειριακό αριθμό
 DocType: Authorization Rule,Average Discount,Μέση έκπτωση
@@ -2584,6 +2597,7 @@
 DocType: Item,Inventory,Απογραφή
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Λήψη ως Json
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
+DocType: Coupon Code,Used,Μεταχειρισμένος
 DocType: Opportunity,With Items,Με Αντικείμενα
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Η καμπάνια &#39;{0}&#39; υπάρχει ήδη για το {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Ομάδα συντήρησης
@@ -2713,7 +2727,7 @@
 						Serial No cannot be ensured",Δεν βρέθηκε ενεργό BOM για το στοιχείο {0}. Δεν είναι δυνατή η εξασφάλιση της παράδοσης με τον \ Αύξοντα Αριθμό
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 DocType: Loan Type,Maximum Loan Amount,Ανώτατο ποσό του δανείου
-DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
+DocType: Coupon Code,Pricing Rule,Κανόνας τιμολόγησης
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Διπλότυπος αριθμός κυλίνδρου για φοιτητή {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 DocType: Company,Default Selling Terms,Προεπιλεγμένοι όροι πώλησης
@@ -2792,6 +2806,7 @@
 DocType: Payment Schedule,Payment Amount,Ποσό πληρωμής
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Ημερομηνία ημ / νίας ημέρας πρέπει να είναι μεταξύ της εργασίας από την ημερομηνία και της ημερομηνίας λήξης εργασίας
 DocType: Healthcare Settings,Healthcare Service Items,Στοιχεία Υπηρεσίας Υγείας
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Μη έγκυρος γραμμικός κώδικας. Δεν υπάρχει στοιχείο συνδεδεμένο σε αυτόν τον γραμμωτό κώδικα.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Assessment Plan,Grading Scale,Κλίμακα βαθμολόγησης
@@ -2911,7 +2926,6 @@
 DocType: Share Transfer,Asset Account,Λογαριασμός Asset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Νέα ημερομηνία κυκλοφορίας θα πρέπει να είναι στο μέλλον
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Lab Test,Technician Name,Όνομα τεχνικού
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3022,6 +3036,7 @@
 DocType: Products Settings,Hide Variants,Απόκρυψη παραλλαγών
 DocType: Lead,Next Contact By,Επόμενη επικοινωνία από
 DocType: Compensatory Leave Request,Compensatory Leave Request,Αίτημα αντισταθμιστικής άδειας
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Δεν είναι δυνατή η υπερπαραγωγή στοιχείου {0} στη σειρά {1} περισσότερο από {2}. Για να επιτρέψετε την υπερχρέωση, παρακαλούμε να ορίσετε το επίδομα στις Ρυθμίσεις Λογαριασμών"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Η ποσότητα για το είδος {0} στη γραμμή {1} είναι απαραίτητη.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Η αποθήκη {0} δεν μπορεί να διαγραφεί, γιατί υπάρχει ποσότητα για το είδος {1}"
 DocType: Blanket Order,Order Type,Τύπος παραγγελίας
@@ -3191,7 +3206,6 @@
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
 DocType: Employee Benefit Claim,Claim Benefit For,Απαίτηση
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Δεν είναι δυνατή η υπερπαραγωγή στοιχείου {0} στη σειρά {1} περισσότερο από {2}. Για να επιτρέψετε την υπερβολική τιμολόγηση, ρυθμίστε τις ρυθμίσεις αποθεμάτων"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Ενημέρωση απόκρισης
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
@@ -3481,6 +3495,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Παρακαλώ ορίστε το νόμισμα στην εταιρεία
 DocType: Workstation,Wages per hour,Μισθοί ανά ώρα
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Ρύθμιση {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} είναι άκυρος. Η Νομισματική Μονάδα πρέπει να είναι {1}
@@ -3810,6 +3825,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Υποβολή βεβαίωσης αποδοχών
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Σε κράτηση
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Μια λύση πρέπει να έχει τουλάχιστον μία σωστή επιλογή
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Εντολές αγοράς
 DocType: Account,Inter Company Account,Εταιρικός λογαριασμός
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Εισαγωγή χύδην
 DocType: Sales Partner,Address & Contacts,Διεύθυνση & Επαφές
@@ -3820,6 +3836,7 @@
 DocType: POS Profile,[Select],[ Επιλέξτε ]
 DocType: Staffing Plan Detail,Number Of Positions,Αριθμός θέσεων
 DocType: Vital Signs,Blood Pressure (diastolic),Πίεση αίματος (διαστολική)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Επιλέξτε τον πελάτη.
 DocType: SMS Log,Sent To,Αποστέλλονται
 DocType: Agriculture Task,Holiday Management,Διαχείριση Διακοπών
 DocType: Payment Request,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
@@ -4029,7 +4046,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} Δεν έχει υποβληθεί
 DocType: Subscription,Trialling,Δοκιμάζοντας
 DocType: Sales Invoice Item,Deferred Revenue,Αναβαλλόμενα έσοδα
-DocType: Bank Account,GL Account,Λογαριασμός GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Ο λογαριασμός μετρητών θα χρησιμοποιηθεί για τη δημιουργία τιμολογίου πωλήσεων
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Εξαίρεση κατηγορίας
 DocType: Member,Membership Expiry Date,Ημερομηνία λήξης μέλους
@@ -4453,13 +4469,13 @@
 DocType: C-Form Invoice Detail,Territory,Περιοχή
 DocType: Pricing Rule,Apply Rule On Item Code,Εφαρμογή κανόνα στον κωδικό στοιχείου
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Έκθεση ισοζυγίου αποθεμάτων
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Τέλη
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Εμφάνιση αθροιστικού ποσού
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ενημέρωση σε εξέλιξη. Μπορεί να πάρει λίγο χρόνο.
 DocType: Production Plan Item,Produced Qty,Παραγόμενη ποσότητα
 DocType: Vehicle Log,Fuel Qty,Ποσότητα καυσίμου
-DocType: Stock Entry,Target Warehouse Name,Όνομα στόχου αποθήκης
 DocType: Work Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
 DocType: Course,Assessment,Εκτίμηση
 DocType: Payment Entry Reference,Allocated,Κατανεμήθηκε
@@ -4537,10 +4553,12 @@
  8. Τρόποι αντιμετώπισης των διαφορών, αποζημίωση, ευθύνη, κλπ ||| 
  9. Διεύθυνση και στοιχεία επικοινωνίας της εταιρείας σας."
 DocType: Homepage Section,Section Based On,Ενότητα βασισμένη σε
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Εμφάνιση εφαρμογής κωδικού κουπονιού
 DocType: Issue,Issue Type,Τύπος Θέματος
 DocType: Attendance,Leave Type,Τύπος άδειας
 DocType: Purchase Invoice,Supplier Invoice Details,Προμηθευτής Λεπτομέρειες Τιμολογίου
 DocType: Agriculture Task,Ignore holidays,Αγνόηση των διακοπών
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Προσθήκη / Επεξεργασία Όρων Κουπονιού
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Η δαπάνη / διαφορά λογαριασμού ({0}) πρέπει να είναι λογαριασμός τύπου 'κέρδη ή ζημίες'
 DocType: Stock Entry Detail,Stock Entry Child,Αποθήκη παιδιού
 DocType: Project,Copied From,Αντιγραφή από
@@ -4715,6 +4733,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Κριτήρια Σχεδίου Αξιολόγησης
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Συναλλαγές
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Αποτροπή παραγγελιών αγοράς
+DocType: Coupon Code,Coupon Name,Όνομα κουπονιού
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Ευαίσθητος
 DocType: Email Campaign,Scheduled,Προγραμματισμένη
 DocType: Shift Type,Working Hours Calculation Based On,Υπολογισμός Ώρας Λειτουργίας με βάση
@@ -4731,7 +4750,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Δημιουργήστε παραλλαγές
 DocType: Vehicle,Diesel,Ντίζελ
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Το νόμισμα του τιμοκαταλόγου δεν έχει επιλεγεί
+DocType: Quick Stock Balance,Available Quantity,διαθέσιμη ποσότητα
 DocType: Purchase Invoice,Availed ITC Cess,Επωφεληθεί ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 ,Student Monthly Attendance Sheet,Φοιτητής Φύλλο Μηνιαία Συμμετοχή
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Κανονισμός αποστολής ισχύει μόνο για την πώληση
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Γραμμή απόσβεσης {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να είναι πριν από την ημερομηνία αγοράς
@@ -4798,8 +4819,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 DocType: Quality Meeting,Quality Meeting,Πραγματική συνάντηση
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Μη-ομάδα σε ομάδα
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPΕπόμενο χρήστη
+DocType: Coupon Code,Coupon Description,Περιγραφή κουπονιού
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Η παρτίδα είναι υποχρεωτική στη σειρά {0}
 DocType: Company,Default Buying Terms,Προεπιλεγμένοι όροι αγοράς
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Το είδος στο αποδεικτικό παραλαβής αγοράς έχει προμηθευτεί
@@ -4962,6 +4983,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Κατά λεπτομέρειες εγγράφου αρ.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Η διαγραφή δεν επιτρέπεται για τη χώρα {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Κόμμα Τύπος είναι υποχρεωτική
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Εφαρμόστε τον κωδικό κουπονιού
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Για την καρτέλα εργασίας {0}, μπορείτε να πραγματοποιήσετε μόνο την καταχώρηση αποθεμάτων τύπου &quot;Μεταφορά υλικού για παραγωγή&quot;"
 DocType: Quality Inspection,Outgoing,Εξερχόμενος
 DocType: Customer Feedback Table,Customer Feedback Table,Πίνακας σχολίων πελατών
@@ -5111,7 +5133,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Στην υποβολή της παραγγελίας αγοράς
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Προσθήκη όλων των προμηθευτών
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Σειρά # {0}: Το κατανεμημένο ποσό δεν μπορεί να είναι μεγαλύτερο από το οφειλόμενο ποσό.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Tally Migration,Parties,Συμβαλλόμενα μέρη
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Εξασφαλισμένα δάνεια
@@ -5143,7 +5164,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Δεν επιτρέπεται να ορίσετε εναλλακτικό στοιχείο για το στοιχείο {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Διαθέσιμο διαθέσιμο ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Δημιουργία τελών
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
@@ -5168,6 +5188,7 @@
 DocType: Quiz Result,Wrong,Λανθασμένος
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
+DocType: Sales Partner,Referral Code,Κωδικός παραπομπής
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Το συνολικό ποσό προκαταβολής δεν μπορεί να είναι μεγαλύτερο από το συνολικό ποσό που έχει επιβληθεί
 DocType: Salary Slip,Hour Rate,Χρέωση ανά ώρα
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Ενεργοποιήστε την αυτόματη αναδιάταξη
@@ -5296,6 +5317,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Εμφάνιση ποσότητας αποθέματος
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Καθαρές ροές από λειτουργικές δραστηριότητες
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Σειρά # {0}: Η κατάσταση πρέπει να είναι {1} για την έκπτωση τιμολογίων {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {1}) δεν βρέθηκε για το στοιχείο: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Στοιχείο 4
 DocType: Student Admission,Admission End Date,Η είσοδος Ημερομηνία Λήξης
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Υπεργολαβίες
@@ -5318,6 +5340,7 @@
 DocType: Travel Request,Fully Sponsored,Πλήρης χορηγία
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Αντίστροφη εγγραφή ημερολογίου
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Δημιουργία κάρτας εργασίας
+DocType: Quotation,Referral Sales Partner,Συνεργάτης πωλήσεων παραπομπής
 DocType: Quality Procedure Process,Process Description,Περιγραφή διαδικασίας
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Ο πελάτης {0} δημιουργείται.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Προς το παρων δεν υπάρχει διαθέσιμο απόθεμα σε καμία αποθήκη
@@ -5452,6 +5475,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Τιμή Λ.Υ.
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Ανάγνωση αρχείου που μεταφορτώθηκε
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Δεν είναι δυνατή η ακύρωση της Παραγγελίας Παραγγελίας, Απεγκαταστήστε την πρώτα για ακύρωση"
+DocType: Coupon Code,Coupon Code,Κωδικός κουπονιού
 DocType: Asset,Journal Entry for Scrap,Εφημερίδα Έναρξη για παλιοσίδερα
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Παρακαλώ κάντε λήψη ειδών από το δελτίο αποστολής
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Γραμμή {0}: επιλέξτε τη θέση εργασίας σε σχέση με τη λειτουργία {1}
@@ -5534,6 +5558,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Απαιτείται η &quot;Ημερομηνία&quot;
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Λυπούμαστε, η ισχύς του κωδικού κουπονιού έχει λήξει"
 DocType: Bank Account,Account Details,Στοιχεία λογαριασμού
 DocType: Crop,Materials Required,Απαιτούμενα υλικά
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Δεν μαθητές Βρέθηκαν
@@ -5571,6 +5596,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Μεταβείτε στους χρήστες
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Το άθροισμα από το καταβληθέν ποσό και το ποσό που διαγράφηκε δεν μπορεί να είναι μεγαλύτερο από το γενικό σύνολο
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},Ο {0} δεν είναι έγκυρος αριθμός παρτίδας για το είδος {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Εισαγάγετε τον έγκυρο κωδικό κουπονιού !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Σημείωση : δεν υπάρχει αρκετό υπόλοιπο άδειας για τον τύπο άδειας {0}
 DocType: Task,Task Description,Περιγραφή των εργασιών
 DocType: Training Event,Seminar,Σεμινάριο
@@ -5834,6 +5860,7 @@
 ,TDS Payable Monthly,TDS πληρωτέα μηνιαία
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Ρυθμίζεται για αντικατάσταση του BOM. Μπορεί να χρειαστούν μερικά λεπτά.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Συνολικές Πληρωμές
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
@@ -5923,6 +5950,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Πάρτε πρώτες ύλες για παραγωγή
 DocType: Job Opening,Job Title,Τίτλος εργασίας
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Μελλοντική Πληρωμή Ref
+DocType: Quotation,Additional Discount and Coupon Code,Πρόσθετος κωδικός έκπτωσης και κουπονιού
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} υποδεικνύει ότι η {1} δεν θα παράσχει μια προσφορά, αλλά  όλα τα στοιχεία έχουν αναφερθεί  \. Ενημέρωση κατάστασης  ""Αίτηση για προσφορά""."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Τα μέγιστα δείγματα - {0} έχουν ήδη διατηρηθεί για το Παρτίδα {1} και το στοιχείο {2} στην Παρτίδα {3}.
@@ -6150,7 +6178,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Ρυθμίσεις για την ιστοσελίδα αρχική σελίδα
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} είναι σε αναμονή μέχρι την {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Οι RFQ δεν επιτρέπονται για {0} λόγω μίας κάρτας αποτελεσμάτων {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Δημιούργησε τιμολόγιο αγοράς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Χρησιμοποιημένα φύλλα
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Το κουπόνι που χρησιμοποιείται είναι {1}. Η επιτρεπόμενη ποσότητα έχει εξαντληθεί
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Θέλετε να υποβάλετε το αίτημα υλικού
 DocType: Job Offer,Awaiting Response,Αναμονή Απάντησης
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6164,6 +6194,7 @@
 DocType: Training Event Employee,Optional,Προαιρετικός
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 DocType: Agriculture Analysis Criteria,Water Analysis,Ανάλυση Νερού
+DocType: Sales Order,Skip Delivery Note,Παράλειψη σημείωσης παράδοσης
 DocType: Price List,Price Not UOM Dependent,Τιμή δεν εξαρτάται από UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} δημιουργήθηκαν παραλλαγές.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Υπάρχει ήδη συμβατική συμφωνία επιπέδου υπηρεσιών.
@@ -6268,6 +6299,7 @@
 DocType: Vehicle,Last Carbon Check,Τελευταία Carbon Έλεγχος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Νομικές δαπάνες
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Παρακαλούμε επιλέξτε ποσότητα σε σειρά
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Παραγγελία εργασίας {0}: δεν βρέθηκε κάρτα εργασίας για τη λειτουργία {1}
 DocType: Purchase Invoice,Posting Time,Ώρα αποστολής
 DocType: Timesheet,% Amount Billed,Ποσό που χρεώνεται%
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Δαπάνες τηλεφώνου
@@ -6370,7 +6402,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και επιβαρύνσεις που προστέθηκαν
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Απόσβεση γραμμής {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να γίνει πριν από την Ημερομηνία διαθέσιμης για χρήση
 ,Sales Funnel,Χοάνη πωλήσεων
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Το Καλάθι
@@ -6466,6 +6497,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Οι Πόντοι Πίστης θα υπολογίζονται από το ποσό που πραγματοποιήθηκε (μέσω του Τιμολογίου Πωλήσεων), με βάση τον συντελεστή συλλογής που αναφέρεται."
 DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
+DocType: Pricing Rule,Coupon Code Based,Κωδικός βάσει κουπονιού
 DocType: Company,HRA Settings,Ρυθμίσεις HRA
 DocType: Homepage,Hero Section,Τμήμα ήρωας
 DocType: Employee Transfer,Transfer Date,Ημερομηνία μεταφοράς
@@ -6581,6 +6613,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Ρυθμίστε το φίλτρο Εταιρεία κενό, εάν η ομάδα είναι &quot;Εταιρεία&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Απόσπαση ημερομηνία αυτή δεν μπορεί να είναι μελλοντική ημερομηνία
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Σειρά # {0}: Αύξων αριθμός {1} δεν ταιριάζει με το {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 DocType: Stock Entry,Target Warehouse Address,Διεύθυνση στόχου αποθήκης
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Περιστασιακή άδεια
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Ο χρόνος πριν από την ώρα έναρξης της αλλαγής ταχυτήτων κατά τη διάρκεια της οποίας εξετάζεται η συμμετοχή του υπαλλήλου για συμμετοχή.
@@ -6615,7 +6648,6 @@
 DocType: Employee Grade,Employee Grade,Υπάλληλος βαθμού
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Εργασία με το κομμάτι
 DocType: GSTR 3B Report,June,Ιούνιος
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Share Balance,From No,Από τον αριθμό
 DocType: Shift Type,Early Exit Grace Period,Πρώτη περίοδος χάριτος εξόδου
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
@@ -6900,7 +6932,6 @@
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Παρακαλώ εισάγετε ρόλο έγκρισης ή χρήστη έγκρισης
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {1}) δεν βρέθηκε για το στοιχείο: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Συμφωνία επιπέδου υπηρεσίας με τον τύπο οντότητας {0} και την οντότητα {1} υπάρχει ήδη.
 DocType: Journal Entry,Write Off Entry,Καταχώρηση διαγραφής
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
@@ -7038,6 +7069,7 @@
 DocType: Budget,Warn,Προειδοποιώ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Όλα τα στοιχεία έχουν ήδη μεταφερθεί για αυτήν την εντολή εργασίας.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
+DocType: Bank Account,Company Account,Εταιρικός λογαριασμός
 DocType: Asset Maintenance,Manufacturing User,Χρήστης παραγωγής
 DocType: Purchase Invoice,Raw Materials Supplied,Πρώτες ύλες που προμηθεύτηκαν
 DocType: Subscription Plan,Payment Plan,Σχέδιο πληρωμής
@@ -7079,6 +7111,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) δεν μπορεί να είναι μεγαλύτερη από την προγραμματισμένη ποσότητα ({2}) στην Παραγγελία Εργασίας {3}
 DocType: Certification Application,Name of Applicant,Όνομα του αιτούντος
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Ώρα Φύλλο για την κατασκευή.
+DocType: Quick Stock Balance,Quick Stock Balance,Γρήγορη ισορροπία αποθεμάτων
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Μερικό σύνολο
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Δεν είναι δυνατή η αλλαγή ιδιοτήτων παραλλαγής μετά από συναλλαγή μετοχών. Θα χρειαστεί να δημιουργήσετε ένα νέο στοιχείο για να το κάνετε αυτό.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless Εντολή SEPA
@@ -7405,6 +7438,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Παρακαλώ να ορίσετε {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} είναι ανενεργός φοιτητής
 DocType: Employee,Health Details,Λεπτομέρειες υγείας
+DocType: Coupon Code,Coupon Type,Τύπος κουπονιού
 DocType: Leave Encashment,Encashable days,Ενδεχόμενες ημέρες
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Για να δημιουργήσετε ένα έγγραφο αναφοράς αιτήματος πληρωμής απαιτείται
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7687,6 +7721,7 @@
 DocType: Hotel Room Package,Amenities,Ανεσεις
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Αυτόματη εξαγωγή όρων πληρωμής
 DocType: QuickBooks Migrator,Undeposited Funds Account,Λογαριασμός χωρίς καταθέσεις
+DocType: Coupon Code,Uses,Χρησιμοποιεί
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Δεν επιτρέπεται πολλαπλή μέθοδος προεπιλογής πληρωμής
 DocType: Sales Invoice,Loyalty Points Redemption,Πίστωση Πόντων Αποπληρωμή
 ,Appointment Analytics,Αντιστοίχιση Analytics
@@ -7703,6 +7738,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Συνολικός προϋπολογισμός
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Αφήστε κενό αν κάνετε ομάδες φοιτητών ανά έτος
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Εάν είναι επιλεγμένο, ο συνολικός αριθμός των εργάσιμων ημερών θα περιλαμβάνει τις αργίες, και αυτό θα μειώσει την αξία του μισθού ανά ημέρα"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Αποτυχία προσθήκης τομέα
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Για να επιτρέψετε την παραλαβή / παράδοση, ενημερώστε την &quot;Over Allowance Receipt / Delivery Allowance&quot; στις Ρυθμίσεις Αποθέματος ή στο Στοιχείο."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Οι εφαρμογές που χρησιμοποιούν το τρέχον κλειδί δεν θα έχουν πρόσβαση, είστε βέβαιοι;"
 DocType: Subscription Settings,Prorate,Φροντίστε
@@ -7715,6 +7751,7 @@
 ,BOM Stock Report,Αναφορά Αποθεματικού BOM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Αν δεν υπάρχει καθορισμένη χρονική περίοδος, τότε η επικοινωνία θα γίνεται από αυτήν την ομάδα"
 DocType: Stock Reconciliation Item,Quantity Difference,ποσότητα Διαφορά
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 ,Electronic Invoice Register,Ηλεκτρονικό μητρώο τιμολογίων
@@ -7968,6 +8005,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Φόροι και επιβαρύνσεις που παρακρατήθηκαν (νόμισμα της εταιρείας)
 DocType: Item Group,General Settings,Γενικές ρυθμίσεις
 DocType: Article,Article,Αρθρο
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Παρακαλώ εισάγετε τον κωδικό κουπονιού !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Από το νόμισμα και σε νόμισμα δεν μπορεί να είναι ίδια
 DocType: Taxable Salary Slab,Percent Deduction,Ποσοστιαία Αφαίρεση
 DocType: GL Entry,To Rename,Για να μετονομάσετε
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 9de782d..6e12892 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contacto del Cliente
 DocType: Shift Type,Enable Auto Attendance,Habilitar asistencia automática
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,"Por favor, introduzca el almacén y la fecha"
 DocType: Lost Reason Detail,Opportunity Lost Reason,Oportunidad Razón perdida
 DocType: Patient Appointment,Check availability,Consultar disponibilidad
 DocType: Retention Bonus,Bonus Payment Date,Fecha de Pago de Bonificación
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Órdenes de Trabajo completadas
 DocType: Support Settings,Forum Posts,Publicaciones del Foro
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","La tarea se ha puesto en cola como un trabajo en segundo plano. En caso de que haya algún problema con el procesamiento en segundo plano, el sistema agregará un comentario sobre el error en esta Reconciliación de inventario y volverá a la etapa Borrador"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Lo sentimos, la validez del código de cupón no ha comenzado"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Base Imponible
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: Leave Policy,Leave Policy Details,Dejar detalles de la política
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumible
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Grado
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 DocType: Restaurant Table,No of Seats,Nro de Asientos
 DocType: Sales Invoice,Overdue and Discounted,Atrasado y con descuento
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Llamada desconectada
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlineado de la suma en palabras
 DocType: Vehicle,Additional Details,Detalles adicionales
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Ninguna descripción definida
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Obtener artículos del almacén
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Solicitudes de compra.
 DocType: POS Closing Voucher Details,Collected Amount,Cantidad Cobrada
 DocType: Lab Test,Submitted Date,Fecha de Envío
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Aprender
 ,Trial Balance (Simple),Balance de Sumas y Saldos (Simple)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Habilitar el Gasto Diferido
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Código de cupón aplicado
 DocType: Asset,Next Depreciation Date,Siguiente Fecha de Depreciación
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Órden de Trabajo
 DocType: Sales Invoice,Total Qty,Cantidad Total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID de correo electrónico del Tutor2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Item,Show in Website (Variant),Mostrar en el sitio web (variante)
 DocType: Employee,Health Concerns,Problemas de salud
 DocType: Payroll Entry,Select Payroll Period,Seleccione el Período de Nómina
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Cuenta de Retención de Impuestos
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Todas las Evaluaciones del Proveedor
+DocType: Coupon Code,To be used to get discount,Para ser utilizado para obtener descuento
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
 DocType: Sales Invoice,Rail,Carril
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Costo real
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Plan de Producción
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Herramienta de Apertura de Creación de Facturas
 DocType: Salary Component,Round to the Nearest Integer,Redondear al entero más cercano
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Permitir que los artículos no en stock se agreguen al carrito
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Devoluciones de ventas
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Establezca la cantidad en transacciones basadas en la entrada del Numero de Serie
 ,Total Stock Summary,Resumen de stock total
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa básica de Hora (divisa de la Compañía)
 ,Qty To Be Billed,Cantidad a facturar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Importe entregado
+DocType: Coupon Code,Gift Card,Tarjeta de regalo
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Cantidad reservada para producción: Cantidad de materias primas para fabricar artículos.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Fecha de Redención
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Esta transacción bancaria ya está completamente conciliada
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Crear parte de horas
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Facturas de compra
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Solo puede renovar si su membresía vence dentro de los 30 días
 DocType: Shopping Cart Settings,Show Stock Availability,Mostrar Disponibilidad de Stock
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Establezca {0} en la categoría de activos {1} o en la empresa {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Cantidad Reservada: Cantidad a pedir a la venta , pero no entregado."
 DocType: Drug Prescription,Interval UOM,Intervalo UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vuelva a seleccionar, si la dirección elegida se edita después de guardar"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Cantidad reservada para subcontrato: Cantidad de materias primas para hacer artículos subcotractados.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Cantidad reservada para subcontrato: Cantidad de materias primas para hacer artículos subcotractados.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 DocType: Item,Hub Publishing Details,Detalle de Publicación del Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Apertura&#39;
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Importar artículos y unidades de medida
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del balance del préstamo
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Agregado a los Detalles
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Lo sentimos, el código de cupón está agotado"
 DocType: Communication Medium,Catch All,Atrapar a todos
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Calendario de Cursos
 DocType: Budget,Applicable on Material Request,Aplicable en la Solicitud de Material
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atributo no válido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} debe ser presentado
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Campañas de correo electrónico
+DocType: Sales Partner,To Track inbound purchase,Para rastrear la compra entrante
 DocType: Buying Settings,Default Supplier Group,Grupo de Proveedores Predeterminado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},La cantidad máxima elegible para el componente {0} excede de {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Hacer entrada de stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuario de Reserva de Hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Establecer estado
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure la serie de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Por favor, seleccione primero el prefijo"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Fecha límite de Cumplimiento
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Cerca de usted
 DocType: Student,O-,O-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Bajo revisión
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Error al iniciar sesión
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Activo {0} creado
+DocType: Coupon Code,Promotional,Promocional
 DocType: Special Test Items,Special Test Items,Artículos de Especiales de Prueba
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Debe ser un usuario con funciones de Administrador del sistema y Administrador de artículos para registrarse en Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Reportes clave
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,DocType
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
 DocType: Subscription Plan,Billing Interval Count,Contador de Intervalo de Facturación
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Citas y Encuentros de Pacientes
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Valor que Falta
 DocType: Employee,Department and Grade,Departamento y Grado
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Fechas de Inicio y Fin
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Términos de Cumplimiento de Plantilla de Contrato
 ,Delivered Items To Be Billed,Envios por facturar
+DocType: Coupon Code,Maximum Use,Uso maximo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Abrir la lista de materiales {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 DocType: Authorization Rule,Average Discount,Descuento Promedio
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,inventario
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Descargar como Json
 DocType: Item,Sales Details,Detalles de ventas
+DocType: Coupon Code,Used,Usado
 DocType: Opportunity,With Items,Con Productos
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',La campaña &#39;{0}&#39; ya existe para {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Equipo de Mantenimiento
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",No se encontró una lista de materiales activa para el artículo {0}. La entrega por \ Serial No no puede garantizarse
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 DocType: Loan Type,Maximum Loan Amount,Cantidad máxima del préstamo
-DocType: Pricing Rule,Pricing Rule,Regla de precios
+DocType: Coupon Code,Pricing Rule,Regla de precios
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Número de rol duplicado para el estudiante {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 DocType: Company,Default Selling Terms,Términos de venta predeterminados
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,Importe Pagado
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,La fecha de medio día debe estar entre la fecha de trabajo y la fecha de finalización del trabajo
 DocType: Healthcare Settings,Healthcare Service Items,Artículos de servicios de salud
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Código de barras inválido. No hay ningún elemento adjunto a este código de barras.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Monto consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Cambio Neto en efectivo
 DocType: Assessment Plan,Grading Scale,Escala de calificación
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Cuenta de Activos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nueva fecha de lanzamiento debe estar en el futuro
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 DocType: Lab Test,Technician Name,Nombre del Técnico
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3003,6 +3017,7 @@
 DocType: Products Settings,Hide Variants,Ocultar variantes
 DocType: Lead,Next Contact By,Siguiente contacto por
 DocType: Compensatory Leave Request,Compensatory Leave Request,Solicitud de licencia compensatoria
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","No se puede facturar en exceso el artículo {0} en la fila {1} más de {2}. Para permitir una facturación excesiva, configure la asignación en la Configuración de cuentas"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Cantidad requerida para el producto {0} en la línea {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},El almacén {0} no se puede eliminar ya que existen elementos para el Producto {1}
 DocType: Blanket Order,Order Type,Tipo de orden
@@ -3172,7 +3187,6 @@
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
 DocType: Employee Benefit Claim,Claim Benefit For,Beneficio de reclamo por
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","No se puede sobrefacturar para el Artículo {0} en la fila {1} más que {2}. Para permitir la sobrefacturación, configura en Configuración de Stock"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Actualizar Respuesta
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3462,6 +3476,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Configurar {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,Las Solicitudes de Materiales siguientes se han planteado de forma automática según el nivel de re-pedido del articulo
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
@@ -3791,6 +3806,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Validar nómina salarial
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,En Espera
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Una pregunta debe tener al menos una opción correcta
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Ordenes de compra
 DocType: Account,Inter Company Account,Cuenta Inter Company
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Importación en masa
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
@@ -3801,6 +3817,7 @@
 DocType: POS Profile,[Select],[Seleccionar]
 DocType: Staffing Plan Detail,Number Of Positions,Numero de Posiciones
 DocType: Vital Signs,Blood Pressure (diastolic),Presión Arterial (diastólica)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Por favor seleccione el cliente.
 DocType: SMS Log,Sent To,Enviado a
 DocType: Agriculture Task,Holiday Management,Gestión de Vacaciones
 DocType: Payment Request,Make Sales Invoice,Crear Factura de Venta
@@ -4010,7 +4027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} no se ha enviado
 DocType: Subscription,Trialling,Periodo de Prueba
 DocType: Sales Invoice Item,Deferred Revenue,Ingresos Diferidos
-DocType: Bank Account,GL Account,Cuenta GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,La cuenta de efectivo se usará para la creación de facturas de ventas
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Subcategoría de Exención
 DocType: Member,Membership Expiry Date,Fecha de Vencimiento de Membresía
@@ -4414,13 +4430,13 @@
 DocType: C-Form Invoice Detail,Territory,Territorio
 DocType: Pricing Rule,Apply Rule On Item Code,Aplicar regla en código de artículo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Informe de saldo de existencias
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Cuota
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Mostrar la Cantidad Acumulada
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Actualización en progreso. Podría tomar un tiempo.
 DocType: Production Plan Item,Produced Qty,Cantidad Producida
 DocType: Vehicle Log,Fuel Qty,Cantidad de Combustible
-DocType: Stock Entry,Target Warehouse Name,Nombre del Almacén de Destino
 DocType: Work Order Operation,Planned Start Time,Hora prevista de inicio
 DocType: Course,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
@@ -4498,10 +4514,12 @@
  1. Formas de abordar disputas, indemnización, responsabilidad, etc. 
  1. Dirección y contacto de su empresa."
 DocType: Homepage Section,Section Based On,Sección basada en
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Mostrar aplicar código de cupón
 DocType: Issue,Issue Type,Tipo de Problema
 DocType: Attendance,Leave Type,Tipo de Licencia
 DocType: Purchase Invoice,Supplier Invoice Details,Detalles de la factura del proveedor
 DocType: Agriculture Task,Ignore holidays,Ignorar vacaciones
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Agregar / editar condiciones de cupón
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
 DocType: Stock Entry Detail,Stock Entry Child,Niño de entrada de stock
 DocType: Project,Copied From,Copiado de
@@ -4676,6 +4694,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterios de evaluación del plan
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transacciones
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Evitar Órdenes de Compra
+DocType: Coupon Code,Coupon Name,Nombre del cupón
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Susceptible
 DocType: Email Campaign,Scheduled,Programado.
 DocType: Shift Type,Working Hours Calculation Based On,Cálculo de horas de trabajo basado en
@@ -4692,7 +4711,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Crear Variantes
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
+DocType: Quick Stock Balance,Available Quantity,Cantidad disponible
 DocType: Purchase Invoice,Availed ITC Cess,Cess ITC disponible
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; Configuración de educación
 ,Student Monthly Attendance Sheet,Hoja de Asistencia Mensual de Estudiante
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Regla de Envío solo aplicable para Ventas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior a la fecha de compra
@@ -4759,8 +4780,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
 DocType: Quality Meeting,Quality Meeting,Reunión de calidad
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,No-Grupo a Grupo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; Naming Series
 DocType: Employee,ERPNext User,Usuario ERPNext
+DocType: Coupon Code,Coupon Description,Descripción del cupón
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},El lote es obligatorio en la fila {0}
 DocType: Company,Default Buying Terms,Términos de compra predeterminados
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de compra del producto suministrado
@@ -4923,6 +4944,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra documento No.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La Eliminación no está permitida para el país {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Tipo de parte es obligatorio
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Aplicar código de cupón
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Para la tarjeta de trabajo {0}, solo puede realizar la entrada de stock del tipo &#39;Transferencia de material para fabricación&#39;"
 DocType: Quality Inspection,Outgoing,Saliente
 DocType: Customer Feedback Table,Customer Feedback Table,Tabla de comentarios del cliente
@@ -5072,7 +5094,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,En el envío de la orden de compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Añadir todos los Proveedores
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila #{0}: Importe asignado no puede ser mayor que la cantidad pendiente.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Tally Migration,Parties,Fiestas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prestamos en garantía
@@ -5104,7 +5125,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},No permitir establecer un elemento alternativo para el Artículo {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La fecha está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Firmante Autorizado
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; Configuración de educación
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC neto disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crear Tarifas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
@@ -5129,6 +5149,7 @@
 DocType: Quiz Result,Wrong,Incorrecto
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasa por la cual la lista de precios es convertida como base del cliente.
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Divisa de la empresa)
+DocType: Sales Partner,Referral Code,código de referencia
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,El monto total anticipado no puede ser mayor que la cantidad total autorizada
 DocType: Salary Slip,Hour Rate,Salario por hora
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Habilitar reordenamiento automático
@@ -5257,6 +5278,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Mostrar Cantidad en Stock
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Efectivo neto de las operaciones
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Fila # {0}: El estado debe ser {1} para el descuento de facturas {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el elemento: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Elemento 4
 DocType: Student Admission,Admission End Date,Fecha de finalización de la admisión
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Subcontratación
@@ -5279,6 +5301,7 @@
 DocType: Travel Request,Fully Sponsored,Totalmente Patrocinado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Invertir Entrada de Diario
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Crear tarjeta de trabajo
+DocType: Quotation,Referral Sales Partner,Socio de ventas de referencia
 DocType: Quality Procedure Process,Process Description,Descripción del proceso
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Se crea el Cliente {0}.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Actualmente no hay stock disponible en ningún almacén
@@ -5413,6 +5436,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Coeficiente de la lista de materiales (LdM)
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Leer el archivo cargado
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","La Órden de Trabajo detenida no se puede cancelar, desactívela primero para cancelarla"
+DocType: Coupon Code,Coupon Code,Código promocional
 DocType: Asset,Journal Entry for Scrap,Entrada de diario para desguace
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,"Por favor, extraiga los productos de la nota de entrega"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Fila {0}: seleccione la estación de trabajo contra la operación {1}
@@ -5495,6 +5519,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Se requiere &#39;Fecha&#39;
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Importación y exportación de datos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Lo sentimos, la validez del código de cupón ha caducado"
 DocType: Bank Account,Account Details,Detalles de la Cuenta
 DocType: Crop,Materials Required,Materiales Necesarios
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,No se han encontrado estudiantes
@@ -5532,6 +5557,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Ir a Usuarios
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el artículo {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Por favor ingrese un código de cupón válido !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 DocType: Task,Task Description,Descripción de la tarea
 DocType: Training Event,Seminar,Seminario
@@ -5795,6 +5821,7 @@
 ,TDS Payable Monthly,TDS pagables Mensualmente
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,En cola para reemplazar la BOM. Puede tomar unos minutos..
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,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/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure el Sistema de nombres de empleados en Recursos humanos&gt; Configuración de recursos humanos
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Pagos totales
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Conciliacion de pagos con facturas
@@ -5884,6 +5911,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Obtener Materias Primas para Producción
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Ref. De pago futuro
+DocType: Quotation,Additional Discount and Coupon Code,Descuento adicional y código de cupón
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indica que {1} no proporcionará una cita, pero todos los elementos \ han sido citados. Actualización del estado de cotización RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Las muestras máximas - {0} ya se han conservado para el lote {1} y el elemento {2} en el lote {3}.
@@ -6111,7 +6139,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Ajustes para la página de inicio de la página web
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} está en espera hasta {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Las solicitudes de Presupuesto (RFQs) no están permitidas para {0} debido a un puntaje de {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Hacer factura de compra
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Licencias Usadas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,Los cupones {0} utilizados son {1}. La cantidad permitida se agota
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,¿Quieres enviar la solicitud de material?
 DocType: Job Offer,Awaiting Response,Esperando Respuesta
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6125,6 +6155,7 @@
 DocType: Training Event Employee,Optional,Opcional
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 DocType: Agriculture Analysis Criteria,Water Analysis,Análisis de Agua
+DocType: Sales Order,Skip Delivery Note,Saltar nota de entrega
 DocType: Price List,Price Not UOM Dependent,Precio no dependiente de UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} variantes creadas
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Ya existe un Acuerdo de nivel de servicio predeterminado.
@@ -6229,6 +6260,7 @@
 DocType: Vehicle,Last Carbon Check,Último control de Carbono
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,GASTOS LEGALES
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,"Por favor, seleccione la cantidad en la fila"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Orden de trabajo {0}: tarjeta de trabajo no encontrada para la operación {1}
 DocType: Purchase Invoice,Posting Time,Hora de Contabilización
 DocType: Timesheet,% Amount Billed,% importe facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Cuenta telefonica
@@ -6331,7 +6363,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior Fecha disponible para usar
 ,Sales Funnel,"""Embudo"" de ventas"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Progreso de Tarea
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carrito
@@ -6426,6 +6457,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,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/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Los puntos de fidelidad se calcularán a partir del gasto realizado (a través de la factura de venta), según el factor de recaudación mencionado."
 DocType: Program Enrollment Tool,Enroll Students,Inscribir Estudiantes
+DocType: Pricing Rule,Coupon Code Based,Código de cupón basado
 DocType: Company,HRA Settings,Configuración de HRA
 DocType: Homepage,Hero Section,Sección de héroe
 DocType: Employee Transfer,Transfer Date,Fecha de Transferencia
@@ -6541,6 +6573,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Por favor, ponga el filtro de la Compañía en blanco si el Grupo Por es ' Empresa'."
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Fecha de entrada no puede ser fecha futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila #{0}: Número de serie {1} no coincide con {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure la serie de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 DocType: Stock Entry,Target Warehouse Address,Dirección del Almacén de Destino
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Permiso ocacional
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,El tiempo antes de la hora de inicio del turno durante el cual se considera la asistencia del Empleado Check-in.
@@ -6575,7 +6608,6 @@
 DocType: Employee Grade,Employee Grade,Grado del Empleado
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Trabajo por obra
 DocType: GSTR 3B Report,June,junio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Share Balance,From No,Desde Nro
 DocType: Shift Type,Early Exit Grace Period,Período de gracia de salida temprana
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
@@ -6860,7 +6892,6 @@
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el elemento: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,El acuerdo de nivel de servicio con el tipo de entidad {0} y la entidad {1} ya existe.
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
@@ -6998,6 +7029,7 @@
 DocType: Budget,Warn,Advertir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Todos los artículos ya han sido transferidos para esta Orden de Trabajo.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
+DocType: Bank Account,Company Account,Cuenta de la compañia
 DocType: Asset Maintenance,Manufacturing User,Usuario de Producción
 DocType: Purchase Invoice,Raw Materials Supplied,Materias primas suministradas
 DocType: Subscription Plan,Payment Plan,Plan de Pago
@@ -7039,6 +7071,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la Orden de trabajo {3}
 DocType: Certification Application,Name of Applicant,Nombre del Solicitante
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Hoja de tiempo para la fabricación.
+DocType: Quick Stock Balance,Quick Stock Balance,Balance de stock rápido
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Subtotal
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,No se pueden cambiar las propiedades de la Variante después de una transacción de stock. Deberá crear un nuevo ítem para hacer esto.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,Mandato de SEPA GoCardless
@@ -7365,6 +7398,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},"Por favor, configure {0}"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} es un estudiante inactivo
 DocType: Employee,Health Details,Detalles de salud
+DocType: Coupon Code,Coupon Type,Tipo de cupón
 DocType: Leave Encashment,Encashable days,Días de Cobro
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Para crear una Solicitud de Pago se requiere el documento de referencia
 DocType: Soil Texture,Sandy Clay,Arcilla Arenosa
@@ -7648,6 +7682,7 @@
 DocType: Hotel Room Package,Amenities,Comodidades
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Obtener automáticamente las condiciones de pago
 DocType: QuickBooks Migrator,Undeposited Funds Account,Cuenta de Fondos no Depositados
+DocType: Coupon Code,Uses,Usos
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,No se permiten múltiple métodos de pago predeterminados
 DocType: Sales Invoice,Loyalty Points Redemption,Redención de Puntos de Lealtad
 ,Appointment Analytics,Análisis de Citas
@@ -7664,6 +7699,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Presupuesto Total
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Deje en blanco si hace grupos de estudiantes por año
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Error al agregar dominio
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Para permitir sobre recibo / entrega, actualice &quot;Recibo sobre recibo / entrega&quot; en la Configuración de inventario o en el Artículo."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Las Aplicaciones que usen la clave actual no podrán acceder, ¿está seguro?"
 DocType: Subscription Settings,Prorate,Prorratear
@@ -7676,6 +7712,7 @@
 ,BOM Stock Report,Reporte de Stock de BOM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Si no hay un intervalo de tiempo asignado, la comunicación será manejada por este grupo"
 DocType: Stock Reconciliation Item,Quantity Difference,Diferencia de Cantidad
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Opportunity Item,Basic Rate,Precio Base
 DocType: GL Entry,Credit Amount,Importe acreditado
 ,Electronic Invoice Register,Registro Electrónico de Facturas
@@ -7929,6 +7966,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto)
 DocType: Item Group,General Settings,Configuración General
 DocType: Article,Article,Artículo
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Por favor ingrese el código de cupón
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,'Desde moneda - a moneda' no pueden ser las mismas
 DocType: Taxable Salary Slab,Percent Deduction,Deducción Porcentual
 DocType: GL Entry,To Rename,Renombrar
diff --git a/erpnext/translations/es_pe.csv b/erpnext/translations/es_pe.csv
index 970f2d5..578e5f8 100644
--- a/erpnext/translations/es_pe.csv
+++ b/erpnext/translations/es_pe.csv
@@ -318,7 +318,7 @@
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de producción de la orden de ventas (OV)
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
-DocType: Pricing Rule,Pricing Rule,Reglas de Precios
+DocType: Coupon Code,Pricing Rule,Reglas de Precios
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Requisición de materiales hacia la órden de compra
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 ,Bank Reconciliation Statement,Extractos Bancarios
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 0e86e1c..bd042b8 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Klienditeenindus Kontakt
 DocType: Shift Type,Enable Auto Attendance,Luba automaatne osalemine
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Palun sisestage ladu ja kuupäev
 DocType: Lost Reason Detail,Opportunity Lost Reason,Võimaluse kaotamise põhjus
 DocType: Patient Appointment,Check availability,Kontrollige saadavust
 DocType: Retention Bonus,Bonus Payment Date,Boonustasu maksmise kuupäev
@@ -263,6 +264,7 @@
 ,Completed Work Orders,Lõppenud töökorraldused
 DocType: Support Settings,Forum Posts,Foorumi postitused
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","See ülesanne on sisse löödud tausttööna. Kui tausttöötlemisel on probleeme, lisab süsteem kommentaari selle varude lepitamise vea kohta ja naaseb mustandi etappi"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",Kahjuks pole kupongi koodi kehtivus alanud
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,maksustatav summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
 DocType: Leave Policy,Leave Policy Details,Jäta poliitika üksikasjad
@@ -327,6 +329,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Tarbitav
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,hinne
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; kaubamärk
 DocType: Restaurant Table,No of Seats,Istekohtade arv
 DocType: Sales Invoice,Overdue and Discounted,Tähtaja ületanud ja soodushinnaga
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Kõne katkestati
@@ -503,6 +506,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Reavahe eest summa sõnadega
 DocType: Vehicle,Additional Details,Täiendavad detailid
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,No kirjeldusest
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Toodete laost toomine
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Küsi osta.
 DocType: POS Closing Voucher Details,Collected Amount,Kogutud summa
 DocType: Lab Test,Submitted Date,Esitatud kuupäev
@@ -610,6 +614,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Õpi
 ,Trial Balance (Simple),Proovitasakaal (lihtne)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Lubatud edasilükatud kulu
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Rakendatud kupongi kood
 DocType: Asset,Next Depreciation Date,Järgmine kulum kuupäev
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktiivsus töötaja kohta
 DocType: Accounts Settings,Settings for Accounts,Seaded konto
@@ -845,8 +850,6 @@
 DocType: BOM,Work Order,Töökäsk
 DocType: Sales Invoice,Total Qty,Kokku Kogus
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Saatke ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Item,Show in Website (Variant),Näita Veebileht (Variant)
 DocType: Employee,Health Concerns,Terviseprobleemid
 DocType: Payroll Entry,Select Payroll Period,Vali palgaarvestuse Periood
@@ -1009,6 +1012,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Maksu kinnipidamise konto
 DocType: Pricing Rule,Sales Partner,Müük Partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Kõik tarnija skoorikaardid.
+DocType: Coupon Code,To be used to get discount,Kasutatakse allahindluse saamiseks
 DocType: Buying Settings,Purchase Receipt Required,Ostutšekk Vajalikud
 DocType: Sales Invoice,Rail,Raudtee
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tegelik maksumus
@@ -1059,6 +1063,7 @@
 DocType: Production Plan,Production Plan,Tootmisplaan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Arve koostamise tööriista avamine
 DocType: Salary Component,Round to the Nearest Integer,Ümarda lähima täisarvuni
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Lubamata toodete lisamine ostukorvi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Müügitulu
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Määrake tehingute arv järjekorranumbriga
 ,Total Stock Summary,Kokku Stock kokkuvõte
@@ -1188,6 +1193,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (firma Valuuta)
 ,Qty To Be Billed,Tühi arve
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Tarnitakse summa
+DocType: Coupon Code,Gift Card,Kinkekaart
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Tootmiseks reserveeritud kogus: toorainekogus toodete valmistamiseks.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Lunastamiskuupäev
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,See pangatehing on juba täielikult lepitud
@@ -1275,6 +1281,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Loo ajaleht
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Ostuarved
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Te saate uuendada ainult siis, kui teie liikmelisus lõpeb 30 päeva jooksul"
 DocType: Shopping Cart Settings,Show Stock Availability,Näita toote laost
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Määra {0} varakategoorias {1} või ettevõtte {2}
@@ -1551,7 +1558,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserveeritud kogus: Müügiks tellitud kogus, kuid tarnimata."
 DocType: Drug Prescription,Interval UOM,Intervall UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Kui valite valitud aadressi pärast salvestamist, vali uuesti"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Allhankelepingu jaoks reserveeritud kogus: Tooraine kogus alamhangete jaoks.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Allhankelepingu jaoks reserveeritud kogus: Tooraine kogus alamhangete jaoks.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 DocType: Item,Hub Publishing Details,Hubi avaldamise üksikasjad
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&quot;Avamine&quot;
@@ -1814,6 +1821,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Üksuste ja UOM-ide importimine
 DocType: Repayment Schedule,Balance Loan Amount,Tasakaal Laenusumma
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Lisatud üksikasjadesse
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Vabandame, kupongi kood on ammendatud"
 DocType: Communication Medium,Catch All,Saagi kõik
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Ajakava kursus
 DocType: Budget,Applicable on Material Request,Kohaldatav materiaalse päringu korral
@@ -1981,6 +1989,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Vale Oskus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} tuleb esitada
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-posti kampaaniad
+DocType: Sales Partner,To Track inbound purchase,Sissetuleva ostu jälgimiseks
 DocType: Buying Settings,Default Supplier Group,Vaikepakkumise grupp
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Komponendi {0} jaoks maksimaalne summa ületab {1}
@@ -2136,8 +2145,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tee aktsiatest kanne
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelli broneeringu kasutaja
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Määra olek
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; Numeratsiooniseeria kaudu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Palun valige eesliide esimene
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Valige Seadistamise seeria väärtuseks {0} menüüst Seadistamine&gt; Seaded&gt; Seeria nimetamine
 DocType: Contract,Fulfilment Deadline,Täitmise tähtaeg
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Sinu lähedal
 DocType: Student,O-,O-
@@ -2261,6 +2270,7 @@
 DocType: Quality Meeting Table,Under Review,Ülevaatlusel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Sisselogimine ebaõnnestus
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Vara {0} loodud
+DocType: Coupon Code,Promotional,Reklaam
 DocType: Special Test Items,Special Test Items,Spetsiaalsed katseüksused
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Turult registreerumiseks peate olema kasutaja, kellel on süsteemihaldur ja üksuste juhtide roll."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Põhiaruanded
@@ -2298,6 +2308,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
 DocType: Subscription Plan,Billing Interval Count,Arveldusvahemiku arv
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Kohtumised ja patsiendikontaktid
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Väärtus on puudu
 DocType: Employee,Department and Grade,Osakond ja aste
@@ -2400,6 +2412,7 @@
 DocType: Project,Start and End Dates,Algus- ja lõppkuupäev
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Lepingu malli täitmise tingimused
 ,Delivered Items To Be Billed,Tarnitakse punkte arve
+DocType: Coupon Code,Maximum Use,Maksimaalne kasutamine
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Avatud Bom {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Ladu ei saa muuta Serial No.
 DocType: Authorization Rule,Average Discount,Keskmine Soodus
@@ -2561,6 +2574,7 @@
 DocType: Item,Inventory,Inventory
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Laadige alla kui Json
 DocType: Item,Sales Details,Müük Üksikasjad
+DocType: Coupon Code,Used,Kasutatud
 DocType: Opportunity,With Items,Objekte
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampaania &#39;{0}&#39; on juba {1} &#39;{2}&#39; jaoks olemas
 DocType: Asset Maintenance,Maintenance Team,Hooldus meeskond
@@ -2690,7 +2704,7 @@
 						Serial No cannot be ensured",Elemendile {0} ei leitud aktiivset BOM-i. Toimetaja \ Serial No ei saa tagada
 DocType: Sales Partner,Sales Partner Target,Müük Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimaalne laenusumma
-DocType: Pricing Rule,Pricing Rule,Hinnakujundus reegel
+DocType: Coupon Code,Pricing Rule,Hinnakujundus reegel
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplicate valtsi arvu üliõpilaste {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materjal Ostusoov Telli
 DocType: Company,Default Selling Terms,Müügitingimused vaikimisi
@@ -2769,6 +2783,7 @@
 DocType: Payment Schedule,Payment Amount,Makse summa
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Poolpäeva kuupäev peab olema ajavahemikus Töö kuupäevast kuni töö lõppkuupäevani
 DocType: Healthcare Settings,Healthcare Service Items,Tervishoiuteenuse üksused
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Kehtetu vöötkood. Sellele vöötkoodile pole lisatud üksust.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Net muutus Cash
 DocType: Assessment Plan,Grading Scale,hindamisskaala
@@ -2888,7 +2903,6 @@
 DocType: Share Transfer,Asset Account,Varakonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Uus väljalaskekuupäev peaks olema tulevikus
 DocType: Purchase Invoice,End date of current invoice's period,Lõppkuupäev jooksva arve on periood
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; HR-sätted
 DocType: Lab Test,Technician Name,Tehniku nimi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2999,6 +3013,7 @@
 DocType: Products Settings,Hide Variants,Peida variandid
 DocType: Lead,Next Contact By,Järgmine kontakteeruda
 DocType: Compensatory Leave Request,Compensatory Leave Request,Hüvitise saamise taotlus
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Üksuse {0} reas {1} ei saa ülearveldada rohkem kui {2}. Ülearvelduste lubamiseks määrake konto konto seadetes soodustus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Kogus vaja Punkt {0} järjest {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"Ladu {0} ei saa kustutada, kui kvantiteet on olemas Punkt {1}"
 DocType: Blanket Order,Order Type,Tellimus Type
@@ -3167,7 +3182,6 @@
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
 DocType: Employee Benefit Claim,Claim Benefit For,Nõude hüvitis
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Elemendile {0} ei saa realt {1} rohkem kui {2} üle märkida. Ülekarvete lubamiseks määrake varude seadistused
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Uuenda vastust
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3457,6 +3471,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Palun täpsustage valuuta Company
 DocType: Workstation,Wages per hour,Palk tunnis
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Seadista {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock tasakaalu Partii {0} halveneb {1} jaoks Punkt {2} lattu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Pärast Material taotlused on tõstatatud automaatselt vastavalt objekti ümber korraldada tasemel
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
@@ -3786,6 +3801,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Esita palgatõend
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Ootel
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Seadmel peab olema vähemalt üks õige valik
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Ostutellimused
 DocType: Account,Inter Company Account,Ettevõtte konto konto
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Import in Bulk
 DocType: Sales Partner,Address & Contacts,Aadress ja Kontakt
@@ -3796,6 +3812,7 @@
 DocType: POS Profile,[Select],[Vali]
 DocType: Staffing Plan Detail,Number Of Positions,Positsioonide arv
 DocType: Vital Signs,Blood Pressure (diastolic),Vererõhk (diastoolne)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Valige klient.
 DocType: SMS Log,Sent To,Saadetud
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Tee müügiarve
@@ -4005,7 +4022,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ei ole esitatud
 DocType: Subscription,Trialling,Triallimine
 DocType: Sales Invoice Item,Deferred Revenue,Edasilükkunud tulud
-DocType: Bank Account,GL Account,GL konto
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Sularahakontot kasutatakse müügiarve loomiseks
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Vabastuse alamkategooria
 DocType: Member,Membership Expiry Date,Liikmestaatuse lõppkuupäev
@@ -4407,13 +4423,13 @@
 DocType: C-Form Invoice Detail,Territory,Territoorium
 DocType: Pricing Rule,Apply Rule On Item Code,Rakenda reeglit üksuse koodil
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Palume mainida ei külastuste vaja
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Varude bilansi aruanne
 DocType: Stock Settings,Default Valuation Method,Vaikimisi hindamismeetod
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,tasu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Kuva kumulatiivne summa
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Värskendamine toimub See võib võtta veidi aega.
 DocType: Production Plan Item,Produced Qty,Toodetud kogus
 DocType: Vehicle Log,Fuel Qty,Kütus Kogus
-DocType: Stock Entry,Target Warehouse Name,Target Warehouse Nimi
 DocType: Work Order Operation,Planned Start Time,Planeeritud Start Time
 DocType: Course,Assessment,Hindamine
 DocType: Payment Entry Reference,Allocated,paigutatud
@@ -4479,10 +4495,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Tüüptingimused, mida saab lisada ost ja müük. Näited: 1. kehtivus pakkumisi. 1. Maksetingimused (ette, krediidi osa eelnevalt jne). 1. Mis on ekstra (või mida klient maksab). 1. Safety / kasutamise hoiatus. 1. Garantii kui tahes. 1. Annab Policy. 1. Tingimused shipping vajaduse korral. 1. viise, kuidas lahendada vaidlusi, hüvitis, vastutus jms 1. Aadress ja Kontakt firma."
 DocType: Homepage Section,Section Based On,Sektsioon põhineb
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Kuva Kupongi koodi rakendamine
 DocType: Issue,Issue Type,Probleemi tüüp
 DocType: Attendance,Leave Type,Jäta Type
 DocType: Purchase Invoice,Supplier Invoice Details,Pakkuja Arve andmed
 DocType: Agriculture Task,Ignore holidays,Ignoreeri puhkust
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Kupongitingimuste lisamine / muutmine
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kulu / Difference konto ({0}) peab olema &quot;kasum või kahjum&quot; kontole
 DocType: Stock Entry Detail,Stock Entry Child,Laosissetuleku laps
 DocType: Project,Copied From,kopeeritud
@@ -4657,6 +4675,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Hindamise kava kriteeriumid
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Tehingud
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vältida ostutellimusi
+DocType: Coupon Code,Coupon Name,Kupongi nimi
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Tundlik
 DocType: Email Campaign,Scheduled,Plaanitud
 DocType: Shift Type,Working Hours Calculation Based On,Tööaja arvestus põhineb
@@ -4673,7 +4692,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Loo variandid
 DocType: Vehicle,Diesel,diisel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Hinnakiri Valuuta ole valitud
+DocType: Quick Stock Balance,Available Quantity,Saadaval kogus
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; Hariduse sätted
 ,Student Monthly Attendance Sheet,Student Kuu osavõtt Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Müügi reegel kehtib ainult Müügi kohta
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Amortisatsiooni rea {0}: järgmine amortisatsiooniaeg ei saa olla enne Ostupäeva
@@ -4740,8 +4761,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
 DocType: Quality Meeting,Quality Meeting,Kvaliteedikohtumine
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group Group
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse&gt; Seadistused&gt; Seeriate nimetamine"
 DocType: Employee,ERPNext User,ERPNext kasutaja
+DocType: Coupon Code,Coupon Description,Kupongi kirjeldus
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Partii on kohustuslik rida {0}
 DocType: Company,Default Buying Terms,Ostmise vaiketingimused
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ostutšekk tooteühiku
@@ -4904,6 +4925,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Vastu Dokumendi Detail Ei
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Kustutamine ei ole lubatud riigis {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Partei Type on kohustuslik
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Rakenda kupongikood
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Töökaardi {0} korral saate teha kande „Tootmiseks mõeldud materjali ülekandmine”
 DocType: Quality Inspection,Outgoing,Väljuv
 DocType: Customer Feedback Table,Customer Feedback Table,Klientide tagasiside tabel
@@ -5053,7 +5075,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ostutellimuse esitamisel
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Lisa kõik pakkujad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Eraldatud summa ei saa olla suurem kui tasumata summa.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 DocType: Tally Migration,Parties,Pooled
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Sirvi Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Tagatud laenud
@@ -5085,7 +5106,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Mitte lubada elemendi {0} jaoks alternatiivset elementi
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Allkirjaõiguslik
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; Hariduse sätted
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC saadaval (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Loo lõivu
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
@@ -5110,6 +5130,7 @@
 DocType: Quiz Result,Wrong,Vale
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Hinda kus Hinnakiri valuuta konverteeritakse kliendi baasvaluuta
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Netosumma (firma Valuuta)
+DocType: Sales Partner,Referral Code,Soovituskood
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Ettemakse kogusumma ei tohi olla suurem kui sanktsioonide kogusumma
 DocType: Salary Slip,Hour Rate,Tund Rate
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Luba automaatne ümberkorraldus
@@ -5236,6 +5257,8 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Palun vali BOM seoses elemendiga {0}
 DocType: Shopping Cart Settings,Show Stock Quantity,Näita tootekogust
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Rahavood äritegevusest
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Rida {0}: arve diskonteerimisel peab olek olema {1} {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {1}) üksusele {2} ei leitud
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Punkt 4
 DocType: Student Admission,Admission End Date,Sissepääs End Date
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Alltöövõtt
@@ -5258,6 +5281,7 @@
 DocType: Travel Request,Fully Sponsored,Täielikult sponsor
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Pöördteadaande kande number
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Looge töökaart
+DocType: Quotation,Referral Sales Partner,Soovituslik müügipartner
 DocType: Quality Procedure Process,Process Description,Protsessi kirjeldus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Klient {0} on loodud.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Praegu pole ühtegi ladu saadaval
@@ -5392,6 +5416,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Bom Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Üleslaaditud faili lugemine
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Peatatud töökorraldust ei saa tühistada. Lõpeta see esmalt tühistamiseks
+DocType: Coupon Code,Coupon Code,kupongi kood
 DocType: Asset,Journal Entry for Scrap,Päevikusissekanne Vanametalli
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Palun tõmmake esemed Saateleht
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Rida {0}: valige tööjaam operatsiooni vastu {1}
@@ -5474,6 +5499,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Vajalik on kuupäev
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Andmete impordi ja ekspordi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",Kahjuks on kupongikoodi kehtivus aegunud
 DocType: Bank Account,Account Details,Konto üksikasjad
 DocType: Crop,Materials Required,Nõutavad materjalid
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,No õpilased Leitud
@@ -5511,6 +5537,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Mine kasutajatele
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Paide summa + maha summa ei saa olla suurem kui Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ei ole kehtiv Partii number jaoks Punkt {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Sisestage kehtiv kupongi kood !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Märkus: Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Task,Task Description,Ülesande kirjeldus
 DocType: Training Event,Seminar,seminar
@@ -5772,6 +5799,7 @@
 ,TDS Payable Monthly,TDS makstakse igakuiselt
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,BOMi asendamine on järjekorras. See võib võtta paar minutit.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; HR-sätted
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Maksed kokku
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial nr Nõutav SERIALIZED Punkt {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Match Maksed arvetega
@@ -5861,6 +5889,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Hankige toorainet tootmiseks
 DocType: Job Opening,Job Title,Töö nimetus
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Tulevaste maksete ref
+DocType: Quotation,Additional Discount and Coupon Code,Täiendav allahindlus ja kuponkikood
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} näitab, et {1} ei anna hinnapakkumist, kuid kõik esemed \ on tsiteeritud. RFQ tsiteeritud oleku värskendamine."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Suurimad proovid - {0} on partii {1} ja pootise {2} jaoks juba paketi {3} jaoks juba salvestatud.
@@ -6088,6 +6117,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Seaded veebisaidi avalehel
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} on ootel kuni {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},"RFQ-d pole {0} jaoks lubatud, kuna tulemuskaardi väärtus on {1}"
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Ostuarve koostamine
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Kasutatud lehed
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Kas soovite esitada materjalitaotluse?
 DocType: Job Offer,Awaiting Response,Vastuse ootamine
@@ -6102,6 +6132,7 @@
 DocType: Training Event Employee,Optional,Valikuline
 DocType: Salary Slip,Earning & Deduction,Teenimine ja mahaarvamine
 DocType: Agriculture Analysis Criteria,Water Analysis,Vee analüüs
+DocType: Sales Order,Skip Delivery Note,Jäta vahele saateleht
 DocType: Price List,Price Not UOM Dependent,Hind ei sõltu UOM-ist
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} variandid on loodud.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Teenuse vaiketaseme leping on juba olemas.
@@ -6206,6 +6237,7 @@
 DocType: Vehicle,Last Carbon Check,Viimati Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Kohtukulude
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Palun valige kogus real
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Töökäsk {0}: töökaarti ei leitud toiminguks {1}
 DocType: Purchase Invoice,Posting Time,Foorumi aeg
 DocType: Timesheet,% Amount Billed,% Arve summa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefoni kulud
@@ -6308,7 +6340,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortisatsiooni rea {0}: järgmine amortisatsiooni kuupäev ei saa olla enne kasutatavat kuupäeva
 ,Sales Funnel,Müügi lehtri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; kaubamärk
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Ostukorvi
@@ -6403,6 +6434,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",Lojaalsuspunktid arvutatakse tehtud kulutustest (müügiarve kaudu) vastavalt mainitud kogumisfaktorile.
 DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
+DocType: Pricing Rule,Coupon Code Based,Kupongi koodil põhinev
 DocType: Company,HRA Settings,HRA seaded
 DocType: Homepage,Hero Section,Kangelaseks
 DocType: Employee Transfer,Transfer Date,Ülekande kuupäev
@@ -6518,6 +6550,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Määrake Company filtreerida tühjaks, kui rühm Autor on &quot;Firma&quot;"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Postitamise kuupäev ei saa olla tulevikus
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} ei ühti {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; Numeratsiooniseeria kaudu
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Aadress
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Casual Leave
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Aeg enne vahetuse algusaega, mille jooksul arvestatakse töötajate registreerimist osalemiseks."
@@ -6552,7 +6585,6 @@
 DocType: Employee Grade,Employee Grade,Töötajate hinne
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Tükitöö
 DocType: GSTR 3B Report,June,Juuni
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Share Balance,From No,Alates nr
 DocType: Shift Type,Early Exit Grace Period,Varajase lahkumise ajapikendus
 DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
@@ -6837,7 +6869,6 @@
 DocType: Warehouse,Warehouse Name,Ladu nimi
 DocType: Naming Series,Select Transaction,Vali Tehing
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Palun sisestage kinnitamine Role või heaks Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {1}) üksusele {2} ei leitud
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Teenuse taseme leping üksuse tüübiga {0} ja olemiga {1} on juba olemas.
 DocType: Journal Entry,Write Off Entry,Kirjutage Off Entry
 DocType: BOM,Rate Of Materials Based On,Hinda põhinevatest materjalidest
@@ -6975,6 +7006,7 @@
 DocType: Budget,Warn,Hoiatama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Kõik üksused on selle töökorralduse jaoks juba üle antud.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
+DocType: Bank Account,Company Account,Ettevõtte konto
 DocType: Asset Maintenance,Manufacturing User,Tootmine Kasutaja
 DocType: Purchase Invoice,Raw Materials Supplied,Tarnitud tooraine
 DocType: Subscription Plan,Payment Plan,Makseplaan
@@ -7016,6 +7048,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ei tohi olla suurem kui kavandatud kogus ({2}) töökorralduses {3}
 DocType: Certification Application,Name of Applicant,Taotleja nimi
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Aeg Sheet valmistamiseks.
+DocType: Quick Stock Balance,Quick Stock Balance,Kiire laobilanss
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,osakokkuvõte
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Variandi omadusi pole võimalik vahetada pärast aktsiatehingut. Selle tegemiseks peate tegema uue punkti.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA volitus
@@ -7342,6 +7375,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Palun määra {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} on mitteaktiivne õpilane
 DocType: Employee,Health Details,Tervis Üksikasjad
+DocType: Coupon Code,Coupon Type,Kupongi tüüp
 DocType: Leave Encashment,Encashable days,Encashable päeva
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Et luua maksenõude viide dokument on nõutav
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7624,6 +7658,7 @@
 DocType: Hotel Room Package,Amenities,Lisavõimalused
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Maksetingimuste automaatne toomine
 DocType: QuickBooks Migrator,Undeposited Funds Account,Rahuldamata rahaliste vahendite konto
+DocType: Coupon Code,Uses,Kasutab
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Mitu vaiketüüpi ei ole lubatud
 DocType: Sales Invoice,Loyalty Points Redemption,Lojaalsuspunktide lunastamine
 ,Appointment Analytics,Kohtumise analüüs
@@ -7640,6 +7675,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Kogu eelarve
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Jäta tühjaks, kui teete õpilast rühmade aastas"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Kui see on märgitud, kokku ei. tööpäevade hulka puhkusereisid ja see vähendab väärtust Palk päevas"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Domeeni lisamine ebaõnnestus
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",Üle kättesaamise / kohaletoimetamise lubamiseks värskendage laoseadetes või üksuses jaotist &quot;Üle kättesaamise / kohaletoimetamise toetus&quot;.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Praeguse võtmega rakendused ei pääse juurde, kas olete kindel?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7652,6 +7688,7 @@
 ,BOM Stock Report,Bom Stock aruanne
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Kui määratud ajapilu pole, siis tegeleb selle grupiga suhtlus"
 DocType: Stock Reconciliation Item,Quantity Difference,Koguse erinevus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Opportunity Item,Basic Rate,Põhimäär
 DocType: GL Entry,Credit Amount,Krediidi summa
 ,Electronic Invoice Register,Elektrooniline arvete register
@@ -7905,6 +7942,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Maksude ja tasude maha (firma Valuuta)
 DocType: Item Group,General Settings,General Settings
 DocType: Article,Article,Artikkel
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Palun sisestage kupongi kood !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Siit Valuuta ja valuuta ei saa olla sama
 DocType: Taxable Salary Slab,Percent Deduction,Väljamakse protsentides
 DocType: GL Entry,To Rename,Ümbernimetamiseks
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 15e2430..f9fd427 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
 DocType: Shift Type,Enable Auto Attendance,حضور و غیاب خودکار را فعال کنید
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,لطفا انبار و تاریخ را وارد کنید
 DocType: Lost Reason Detail,Opportunity Lost Reason,فرصت از دست رفته دلیل
 DocType: Patient Appointment,Check availability,بررسی در دسترس بودن
 DocType: Retention Bonus,Bonus Payment Date,تاریخ پرداخت پاداش
@@ -263,6 +264,7 @@
 ,Completed Work Orders,سفارشات کاری کامل شده است
 DocType: Support Settings,Forum Posts,پست های انجمن
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",این کار به عنوان یک کار پس زمینه درج شده است. در صورت بروز مشکل در پردازش در پس زمینه ، سیستم در مورد خطا در این آشتی سهام نظر می دهد و به مرحله پیش نویس بازگشت.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",متأسفیم ، اعتبار کد کوپن شروع نشده است
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,مبلغ مشمول مالیات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: Leave Policy,Leave Policy Details,ترک جزئیات سیاست
@@ -327,6 +329,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,مصرفی
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,مقطع تحصیلی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 DocType: Restaurant Table,No of Seats,بدون صندلی
 DocType: Sales Invoice,Overdue and Discounted,عقب افتاده و تخفیف
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,تماس قطع شد
@@ -502,6 +505,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,فاصله بین خطوط برای مبلغ به حروف
 DocType: Vehicle,Additional Details,توضیحات بیشتر
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,بدون شرح داده می شود
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,گرفتن موارد از انبار
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,درخواست برای خرید.
 DocType: POS Closing Voucher Details,Collected Amount,مقدار جمع آوری شده
 DocType: Lab Test,Submitted Date,تاریخ ارسال شده
@@ -609,6 +613,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,فرا گرفتن
 ,Trial Balance (Simple),موجودی آزمایشی (ساده)
 DocType: Purchase Invoice Item,Enable Deferred Expense,فعال کردن هزینه معوق
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,کد کوپن کاربردی
 DocType: Asset,Next Depreciation Date,بعدی تاریخ استهلاک
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,هزینه فعالیت به ازای هر کارمند
 DocType: Accounts Settings,Settings for Accounts,تنظیمات برای حساب
@@ -839,8 +844,6 @@
 DocType: BOM,Work Order,سفارش کار
 DocType: Sales Invoice,Total Qty,مجموع تعداد
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID ایمیل
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 DocType: Item,Show in Website (Variant),نمایش در وب سایت (نوع)
 DocType: Employee,Health Concerns,نگرانی های بهداشتی
 DocType: Payroll Entry,Select Payroll Period,انتخاب کنید حقوق و دستمزد دوره
@@ -1001,6 +1004,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,حساب سپرده مالیاتی
 DocType: Pricing Rule,Sales Partner,شریک فروش
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,همه کارت امتیازی ارائه شده.
+DocType: Coupon Code,To be used to get discount,مورد استفاده قرار می گیرد برای گرفتن تخفیف
 DocType: Buying Settings,Purchase Receipt Required,رسید خرید مورد نیاز
 DocType: Sales Invoice,Rail,ریل
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,هزینه واقعی
@@ -1049,6 +1053,7 @@
 DocType: Production Plan,Production Plan,برنامه تولید
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,افتتاح حساب ایجاد ابزار
 DocType: Salary Component,Round to the Nearest Integer,دور تا نزدیکترین علاقه
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,اجازه دهید مواردی که موجود نیستند به سبد خرید اضافه شوند
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,برگشت فروش
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,مقدار در معاملات را بر اساس سریال بدون ورودی تنظیم کنید
 ,Total Stock Summary,خلاصه سهام مجموع
@@ -1175,6 +1180,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),یک ساعت یک نرخ پایه (شرکت ارز)
 ,Qty To Be Billed,Qty به صورتحساب است
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,تحویل مبلغ
+DocType: Coupon Code,Gift Card,کارت هدیه
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,قطعه رزرو شده برای تولید: مقدار مواد اولیه برای ساخت کالاهای تولیدی.
 DocType: Loyalty Point Entry Redemption,Redemption Date,تاریخ رستگاری
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,این تراکنش بانکی قبلاً کاملاً آشتی داده شده است
@@ -1209,6 +1215,7 @@
 DocType: Loan,Total Interest Payable,منافع کل قابل پرداخت
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Reason for Hold,دلیل نگه داشتن
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,مالیات هزینه فرود آمد و اتهامات
+apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges,ردیف {0}: لطفاً دلیل معافیت مالیاتی در مالیات و عوارض فروش را تعیین کنید
 DocType: Quality Goal Objective,Quality Goal Objective,هدف کیفیت هدف
 DocType: Work Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: Purchase Invoice Item,Deferred Expense Account,حساب هزینه معوق
@@ -1230,6 +1237,7 @@
 DocType: Bank Guarantee,Bank Guarantee Number,بانک شماره گارانتی
 DocType: Assessment Criteria,Assessment Criteria,معیارهای ارزیابی
 DocType: BOM Item,Basic Rate (Company Currency),نرخ پایه (شرکت ارز)
+apps/erpnext/erpnext/accounts/doctype/account/account.py,"While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA",هنگام ایجاد حساب کاربری برای شرکت کودک {0} ، حساب والدین {1} یافت نشد. لطفاً حساب والدین را در COA مربوطه ایجاد کنید
 apps/erpnext/erpnext/support/doctype/issue/issue.js,Split Issue,موضوع تقسیم شده
 DocType: Student Attendance,Student Attendance,حضور دانش آموز
 apps/erpnext/erpnext/regional/report/electronic_invoice_register/electronic_invoice_register.js,No data to export,داده ای برای صادرات وجود ندارد
@@ -1260,6 +1268,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,برگه ایجاد کنید
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,فاکتورها را خریداری کنید
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,شما فقط می توانید تمدید کنید اگر عضویت شما در 30 روز منقضی شود
 DocType: Shopping Cart Settings,Show Stock Availability,نمایش موجودی
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},{0} را در دسته دارایی {1} یا شرکت {2}
@@ -1535,7 +1544,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",Qty رزرو شده: مقدار سفارش برای فروش سفارش داده می شود ، اما تحویل داده نمی شود.
 DocType: Drug Prescription,Interval UOM,فاصله UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",در صورتی که آدرس انتخاب شده پس از ذخیره ویرایش، مجددا انتخاب کنید
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Qty رزرو شده برای قراردادهای فرعی: مقدار مواد اولیه برای ساخت وسایل فرعی.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty رزرو شده برای قراردادهای فرعی: مقدار مواد اولیه برای ساخت وسایل فرعی.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 DocType: Item,Hub Publishing Details,جزئیات انتشار هاب
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;افتتاح&#39;
@@ -1797,6 +1806,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,وارد کردن موارد و UOM
 DocType: Repayment Schedule,Balance Loan Amount,تعادل وام مبلغ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,به جزئیات اضافه شده است
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",با عرض پوزش ، کد کوپن خسته شده است
 DocType: Communication Medium,Catch All,گرفتن همه
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,دوره برنامه
 DocType: Budget,Applicable on Material Request,قابل اجرا در درخواست مواد
@@ -1964,6 +1974,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ویژگی معتبر نیست
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} باید قطعی شود
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,کمپین های ایمیل
+DocType: Sales Partner,To Track inbound purchase,برای ردیابی خرید ورودی
 DocType: Buying Settings,Default Supplier Group,گروه پیشفرض شرکت
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},حداکثر واجد شرایط برای کامپوننت {0} بیش از {1}
@@ -2117,7 +2128,6 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ورود سهام
 DocType: Hotel Room Reservation,Hotel Reservation User,کاربر رزرو هتل
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,تنظیم وضعیت
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Contract,Fulfilment Deadline,آخرین مهلت تحویل
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,نزدیک تو
@@ -2241,6 +2251,7 @@
 DocType: Quality Meeting Table,Under Review,تحت بررسی
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,ورود به سیستم ناموفق بود
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,دارایی {0} ایجاد شد
+DocType: Coupon Code,Promotional,تبلیغاتی
 DocType: Special Test Items,Special Test Items,آیتم های تست ویژه
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,برای ثبت نام در Marketplace، باید کاربر با مدیر سیستم مدیریت و نقش آیتم باشد.
 apps/erpnext/erpnext/config/buying.py,Key Reports,گزارش های کلیدی
@@ -2278,6 +2289,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,نوع فیلم کارگردان تهیه کننده
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
 DocType: Subscription Plan,Billing Interval Count,تعداد واسطهای صورتحساب
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,ملاقات ها و برخورد های بیمار
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,ارزش گمشده
 DocType: Employee,Department and Grade,گروه و درجه
@@ -2377,6 +2390,7 @@
 DocType: Project,Start and End Dates,تاریخ شروع و پایان
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,شرایط قرارداد الگو
 ,Delivered Items To Be Billed,آیتم ها تحویل داده شده به صورتحساب می شود
+DocType: Coupon Code,Maximum Use,حداکثر استفاده
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},گسترش BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,انبار می توانید برای شماره سریال نمی تواند تغییر
 DocType: Authorization Rule,Average Discount,میانگین تخفیف
@@ -2536,6 +2550,7 @@
 DocType: Item,Inventory,فهرست
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,به عنوان Json بارگیری کنید
 DocType: Item,Sales Details,جزییات فروش
+DocType: Coupon Code,Used,استفاده شده
 DocType: Opportunity,With Items,با اقلام
 DocType: Asset Maintenance,Maintenance Team,تیم تعمیر و نگهداری
 DocType: Homepage Section,"Order in which sections should appear. 0 is first, 1 is second and so on.",ترتیب که در آن بخش ها باید ظاهر شوند. 0 در درجه اول ، 1 دوم است و غیره.
@@ -2661,7 +2676,7 @@
 						Serial No cannot be ensured",هیچ BOM فعال برای آیتم {0} یافت نشد. تحویل توسط \ Serial No می تواند تضمین شود
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 DocType: Loan Type,Maximum Loan Amount,حداکثر مبلغ وام
-DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
+DocType: Coupon Code,Pricing Rule,قانون قیمت گذاری
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},تعداد رول تکراری برای دانشجویان {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 DocType: Company,Default Selling Terms,شرایط فروش پیش فرض
@@ -2740,6 +2755,7 @@
 DocType: Payment Schedule,Payment Amount,مبلغ پرداختی
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,تاریخ نود روز باید بین کار از تاریخ و تاریخ پایان کار باشد
 DocType: Healthcare Settings,Healthcare Service Items,اقلام خدمات بهداشتی
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,بارکد نامعتبر است. هیچ موردی به این بارکد وصل نشده است.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,تغییر خالص در نقدی
 DocType: Assessment Plan,Grading Scale,مقیاس درجه بندی
@@ -2858,7 +2874,6 @@
 DocType: Share Transfer,Asset Account,حساب دارایی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,تاریخ انتشار جدید باید در آینده باشد
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 DocType: Lab Test,Technician Name,نام تکنسین
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3133,7 +3148,6 @@
 DocType: Student,Student Mobile Number,دانشجو شماره موبایل
 DocType: Item,Has Variants,دارای انواع
 DocType: Employee Benefit Claim,Claim Benefit For,درخواست مزایا برای
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{Item} {{0}} در ردیف {1} بیش از {2} نمیتواند برای اجازه دادن به بیش از صدور صورت حساب، لطفا در تنظیمات سهام تنظیم کنید
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,به روز رسانی پاسخ
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
@@ -3418,6 +3432,7 @@
 DocType: Vehicle,Fuel Type,نوع سوخت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,لطفا ارز در شرکت مشخص
 DocType: Workstation,Wages per hour,دستمزد در ساعت
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
@@ -3746,6 +3761,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,ثبت کردن لغزش حقوق
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,در حال برگزاری
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,یک کلاهبرداری حداقل باید یک گزینه صحیح داشته باشد
+apps/erpnext/erpnext/hooks.py,Purchase Orders,سفارشات خرید
 DocType: Account,Inter Company Account,حساب شرکت اینتر
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,واردات به صورت فله
 DocType: Sales Partner,Address & Contacts,آدرس و اطلاعات تماس
@@ -3756,6 +3772,7 @@
 DocType: POS Profile,[Select],[انتخاب]
 DocType: Staffing Plan Detail,Number Of Positions,تعداد موقعیت ها
 DocType: Vital Signs,Blood Pressure (diastolic),فشار خون (دیاستولیک)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,لطفا مشتری را انتخاب کنید.
 DocType: SMS Log,Sent To,فرستادن به
 DocType: Agriculture Task,Holiday Management,مدیریت تعطیلات
 DocType: Payment Request,Make Sales Invoice,ایجاد فاکتور فروش
@@ -3961,7 +3978,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ثبت نشده است
 DocType: Subscription,Trialling,آزمایشی
 DocType: Sales Invoice Item,Deferred Revenue,درآمد معوق
-DocType: Bank Account,GL Account,حساب GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,حساب نقدی برای ایجاد صورتحساب فروش استفاده می شود
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,معافیت زیر رده
 DocType: Member,Membership Expiry Date,عضویت در تاریخ انقضا
@@ -4356,13 +4372,13 @@
 DocType: C-Form Invoice Detail,Territory,منطقه
 DocType: Pricing Rule,Apply Rule On Item Code,استفاده از قانون در مورد کد
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,گزارش موجودی سهام
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,پرداخت
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,نمایش مقدار تجمعی
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,در حال بروزرسانی. ممکن است کمی طول بکشد.
 DocType: Production Plan Item,Produced Qty,تعداد تولیدی
 DocType: Vehicle Log,Fuel Qty,تعداد سوخت
-DocType: Stock Entry,Target Warehouse Name,نام انبار هدف
 DocType: Work Order Operation,Planned Start Time,برنامه ریزی زمان شروع
 DocType: Course,Assessment,ارزیابی
 DocType: Payment Entry Reference,Allocated,اختصاص داده
@@ -4428,10 +4444,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.",شرایط و ضوابط استاندارد است که می تواند به خرید و فروش اضافه شده است. مثال: 1. اعتبار ارائه دهد. 1. شرایط پرداخت (در پیش است، در اعتبار، بخشی از پیش و غیره). 1. چه اضافی (یا قابل پرداخت توسط مشتری) می باشد. 1. ایمنی هشدار / استفاده. 1. گارانتی در صورت وجود. 1. بازگرداندن سیاست. 1. شرایط حمل و نقل، اگر قابل اجرا است. 1. راه های مقابله با اختلافات، غرامت، مسئولیت، و غیره 1. آدرس و تماس با شرکت شما.
 DocType: Homepage Section,Section Based On,بخش مبتنی بر
+DocType: Shopping Cart Settings,Show Apply Coupon Code,نمایش درخواست کد کوپن
 DocType: Issue,Issue Type,نوع مقاله
 DocType: Attendance,Leave Type,نوع مرخصی
 DocType: Purchase Invoice,Supplier Invoice Details,عرضه کننده اطلاعات فاکتور
 DocType: Agriculture Task,Ignore holidays,تعطیلات را نادیده بگیرید
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,شرایط کوپن را اضافه یا ویرایش کنید
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب هزینه / تفاوت ({0}) باید یک حساب کاربری &#39;، سود و ضرر باشد
 DocType: Stock Entry Detail,Stock Entry Child,کودک ورود سهام
 DocType: Project,Copied From,کپی شده از
@@ -4601,6 +4619,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معیارهای ارزیابی طرح
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,معاملات
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,جلوگیری از سفارشات خرید
+DocType: Coupon Code,Coupon Name,نام کوپن
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,حساس
 DocType: Email Campaign,Scheduled,برنامه ریزی
 DocType: Shift Type,Working Hours Calculation Based On,محاسبه ساعت کار بر اساس
@@ -4617,7 +4636,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,ایجاد انواع
 DocType: Vehicle,Diesel,دیزل
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,لیست قیمت ارز انتخاب نشده
+DocType: Quick Stock Balance,Available Quantity,مقدار موجود
 DocType: Purchase Invoice,Availed ITC Cess,ITC به سرقت رفته است
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 ,Student Monthly Attendance Sheet,دانشجو جدول حضور ماهانه
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,قانون حمل و نقل فقط برای فروش قابل اجرا است
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ردۀ تخریب {0}: تاریخ خرابی بعدی بعد از تاریخ خرید نمی تواند باشد
@@ -4685,6 +4706,7 @@
 DocType: Quality Meeting,Quality Meeting,جلسه کیفیت
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,غیر گروه به گروه
 DocType: Employee,ERPNext User,کاربر ERPNext
+DocType: Coupon Code,Coupon Description,توضیحات کوپن
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},دسته ای در ردیف الزامی است {0}
 DocType: Company,Default Buying Terms,شرایط خرید پیش فرض
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,مورد رسید خرید عرضه
@@ -4846,6 +4868,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,جزئیات سند علیه هیچ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},حذف برای کشور ممنوع است {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,نوع حزب الزامی است
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,کد کوپن را اعمال کنید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",برای کارت شغلی {0} ، فقط می توانید نوع ورود سهام &quot;انتقال مواد برای ساخت&quot; را تهیه کنید
 DocType: Quality Inspection,Outgoing,خروجی
 DocType: Customer Feedback Table,Customer Feedback Table,جدول بازخورد مشتری
@@ -4994,7 +5017,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,در ارسال سفارش خرید
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,اضافه کردن همه تامین کنندگان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ردیف # {0}: مقدار اختصاص داده شده نمی تواند بیشتر از مقدار برجسته.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 DocType: Tally Migration,Parties,مهمانی ها
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,وام
@@ -5026,7 +5048,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},اجازه نمیدهد که آیتم جایگزین برای آیتم {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,امضای مجاز
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC خالص موجود (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ایجاد هزینه ها
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق فاکتورخرید )
@@ -5050,6 +5071,7 @@
 DocType: Quiz Result,Wrong,اشتباه
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,سرعت که در آن لیست قیمت ارز به ارز پایه مشتری تبدیل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
+DocType: Sales Partner,Referral Code,کد ارجاع
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,مبلغ پیشنهادی کل نمیتواند بیشتر از مجموع مبلغ مجاز باشد
 DocType: Salary Slip,Hour Rate,یک ساعت یک نرخ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,سفارش مجدد خودکار را فعال کنید
@@ -5198,6 +5220,7 @@
 DocType: Travel Request,Fully Sponsored,کاملا حمایت شده
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,ورودی مجله معکوس
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,ایجاد کارت شغلی
+DocType: Quotation,Referral Sales Partner,شریک فروش ارجاع
 DocType: Quality Procedure Process,Process Description,شرح فرایند
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,مشتری {0} ایجاد شده است
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,در حال حاضر هیچ کالایی در انبار وجود ندارد
@@ -5328,6 +5351,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM نرخ
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,خواندن پرونده بارگذاری شده
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",کار متوقف کار را نمی توان لغو کرد، برای لغو آن ابتدا آن را متوقف کنید
+DocType: Coupon Code,Coupon Code,کد کوپن
 DocType: Asset,Journal Entry for Scrap,ورودی مجله برای ضایعات
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,لطفا توجه داشته باشید تحویل اقلام از جلو
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},ردیف {0}: ایستگاه کاری را در برابر عملیات انتخاب کنید {1}
@@ -5407,6 +5431,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;تاریخ&#39; الزامی است
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,اطلاعات واردات و صادرات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",متأسفیم ، اعتبار کد کوپن منقضی شده است
 DocType: Bank Account,Account Details,جزئیات حساب
 DocType: Crop,Materials Required,مواد مورد نیاز
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,هیچ دانش آموزان یافت
@@ -5444,6 +5469,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,برو به کاربران
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,مبلغ پرداخت شده + نوشتن کردن مقدار نمی تواند بیشتر از جمع کل
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} است تعداد دسته معتبر برای مورد نمی {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,لطفا کد کوپن معتبر را وارد کنید !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},نکته: تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Task,Task Description,شرح وظیفه
 DocType: Training Event,Seminar,سمینار
@@ -5704,6 +5730,7 @@
 ,TDS Payable Monthly,TDS پرداخت ماهانه
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,برای جایگزینی BOM صفر ممکن است چند دقیقه طول بکشد.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,کل پرداخت ها
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},سریال شماره سریال مورد نیاز برای مورد {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,پرداخت بازی با فاکتورها
@@ -5792,6 +5819,7 @@
 DocType: Production Plan,Get Raw Materials For Production,دریافت مواد اولیه برای تولید
 DocType: Job Opening,Job Title,عنوان شغلی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,آینده پرداخت Ref
+DocType: Quotation,Additional Discount and Coupon Code,تخفیف اضافی و کد کوپن
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0} نشان می دهد که {1} یک نقل قول را ارائه نمی کند، اما همه اقلام نقل شده است. به روز رسانی وضعیت نقل قول RFQ.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,حداکثر نمونه - {0} برای Batch {1} و Item {2} در Batch {3} حفظ شده است.
@@ -5867,6 +5895,7 @@
 DocType: Employee Benefit Application,Dispensed Amount (Pro-rated),مقدار اعطا شده (امتیاز داده شده)
 DocType: Student,Guardian Details,نگهبان جزییات
 DocType: C-Form,C-Form,C-فرم
+apps/erpnext/erpnext/regional/india/utils.py,Invalid GSTIN! First 2 digits of GSTIN should match with State number {0}.,GSTIN نامعتبر است! 2 رقم اول GSTIN باید با شماره دولت {0} مطابقت داشته باشد.
 DocType: Agriculture Task,Start Day,روز شروع
 DocType: Vehicle,Chassis No,شاسی
 DocType: Payment Entry,Initiated,آغاز
@@ -6015,6 +6044,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,تنظیمات برای صفحه اصلی وب سایت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} تا پایان {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ها برای {0} مجاز نیستند چرا که یک کارت امتیازی از {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,را خریداری فاکتور
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,برگهای مورد استفاده
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,آیا می خواهید درخواست مطالب را ارسال کنید
 DocType: Job Offer,Awaiting Response,در انتظار پاسخ
@@ -6029,6 +6059,7 @@
 DocType: Training Event Employee,Optional,اختیاری
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 DocType: Agriculture Analysis Criteria,Water Analysis,تجزیه و تحلیل آب
+DocType: Sales Order,Skip Delivery Note,پرش به یادداشت تحویل
 DocType: Price List,Price Not UOM Dependent,قیمت وابسته UOM نیست
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} انواع ایجاد شده است.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,توافق نامه سطح سرویس پیش فرض از قبل وجود دارد.
@@ -6233,7 +6264,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات و هزینه اضافه شده
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,مقدار خسارت ردیف {0}: تاریخ بعد از انهدام بعدی قبل از موجود بودن برای تاریخ استفاده نمی شود
 ,Sales Funnel,قیف فروش
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,گاری
@@ -6327,6 +6357,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",امتیازات وفاداری از هزینه انجام شده (از طریق صورتحساب فروش) بر اساس فاکتور جمع آوری شده ذکر شده محاسبه خواهد شد.
 DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
+DocType: Pricing Rule,Coupon Code Based,کد کوپن بر اساس
 DocType: Company,HRA Settings,تنظیمات HRA
 DocType: Homepage,Hero Section,بخش قهرمان
 DocType: Employee Transfer,Transfer Date,تاریخ انتقال
@@ -6440,6 +6471,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',لطفا مجموعه شرکت فیلتر خالی اگر گروه توسط است شرکت &#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,مجوز های ارسال و تاریخ نمی تواند تاریخ آینده
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ردیف # {0}: سریال نه {1} با مطابقت ندارد {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 DocType: Stock Entry,Target Warehouse Address,آدرس انبار هدف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,مرخصی گاه به گاه
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,زمان قبل از شروع کار شیفت که در آن Check-in کارمندان برای حضور در نظر گرفته می شود.
@@ -6474,7 +6506,6 @@
 DocType: Employee Grade,Employee Grade,درجه کارمند
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,کار از روی مقاطعه
 DocType: GSTR 3B Report,June,ژوئن
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 DocType: Share Balance,From No,از شماره
 DocType: Shift Type,Early Exit Grace Period,زودرس دوره گریس
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
@@ -6891,6 +6922,7 @@
 DocType: Budget,Warn,هشدار دادن
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,همه اقلام در حال حاضر برای این سفارش کار منتقل شده است.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
+DocType: Bank Account,Company Account,حساب شرکت
 DocType: Asset Maintenance,Manufacturing User,ساخت کاربری
 DocType: Purchase Invoice,Raw Materials Supplied,مواد اولیه عرضه شده
 DocType: Subscription Plan,Payment Plan,برنامه پرداخت
@@ -6932,6 +6964,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) نمیتواند بیشتر از مقدار برنامه ریزی ({2}) در سفارش کاری باشد {3}
 DocType: Certification Application,Name of Applicant,نام متقاضی
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,ورق زمان برای تولید.
+DocType: Quick Stock Balance,Quick Stock Balance,مانده سهام سریع
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,جمع جزء
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,پس از معاملات بورس نمی تواند خواص Variant را تغییر دهد. برای انجام این کار باید یک مورد جدید ایجاد کنید.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless مجوز SEPA
@@ -7253,6 +7286,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},لطفا {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} دانشجوی غیر فعال است
 DocType: Employee,Health Details,جزییات بهداشت
+DocType: Coupon Code,Coupon Type,نوع کوپن
 DocType: Leave Encashment,Encashable days,روزهای Encashable
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,برای ایجاد یک درخواست پاسخ به پرداخت سند مرجع مورد نیاز است
 DocType: Soil Texture,Sandy Clay,خاک رس شنی
@@ -7533,6 +7567,7 @@
 DocType: Hotel Room Package,Amenities,امکانات
 DocType: Accounts Settings,Automatically Fetch Payment Terms,شرایط پرداخت به صورت خودکار را اخذ کنید
 DocType: QuickBooks Migrator,Undeposited Funds Account,حساب صندوق غیرقانونی
+DocType: Coupon Code,Uses,استفاده می کند
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,حالت پیش پرداخت چندگانه مجاز نیست
 DocType: Sales Invoice,Loyalty Points Redemption,بازده وفاداری
 ,Appointment Analytics,انتصاب انتصاب
@@ -7549,6 +7584,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,کل بودجه
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,خالی بگذارید اگر شما را به گروه دانش آموز در سال
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",اگر علامت زده شود، هیچ مجموع. از روز کاری شامل تعطیلات، و این خواهد شد که ارزش حقوق پستها در طول روز کاهش
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,دامنه اضافه نشد
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",برای اجازه بیش از دریافت / تحویل ، &quot;تنظیم بیش از دریافت / تحویل&quot; را در تنظیمات سهام یا مورد به روز کنید.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?",برنامه های کاربردی با استفاده از کلید فعلی قادر به دسترسی نخواهند بود، آیا مطمئن هستید؟
 DocType: Subscription Settings,Prorate,پروانه
@@ -7561,6 +7597,7 @@
 ,BOM Stock Report,BOM گزارش سهام
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",در صورت عدم وجود زمان بندی اختصاصی ، ارتباطات توسط این گروه انجام می شود
 DocType: Stock Reconciliation Item,Quantity Difference,تفاوت تعداد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 ,Electronic Invoice Register,ثبت فاکتور الکترونیکی
@@ -7811,6 +7848,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),مالیات و هزینه کسر (شرکت ارز)
 DocType: Item Group,General Settings,تنظیمات عمومی
 DocType: Article,Article,مقاله
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,لطفا کد کوپن را وارد کنید !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,از پول و ارز را نمی توان همان
 DocType: Taxable Salary Slab,Percent Deduction,کاهش درصد
 DocType: GL Entry,To Rename,تغییر نام دهید
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 44f898e..1b56db2 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
 DocType: Shift Type,Enable Auto Attendance,Ota automaattinen läsnäolo käyttöön
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Anna varasto ja päivämäärä
 DocType: Lost Reason Detail,Opportunity Lost Reason,Mahdollisuus menetetty syy
 DocType: Patient Appointment,Check availability,Tarkista saatavuus
 DocType: Retention Bonus,Bonus Payment Date,Bonuspäivä
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Valmistuneet työmääräykset
 DocType: Support Settings,Forum Posts,Foorumin viestit
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Tehtävä on vallattu taustatyöksi. Jos taustalla tapahtuvaan käsittelyyn liittyy ongelmia, järjestelmä lisää kommentin tämän kaluston täsmäytyksen virheestä ja palaa Luonnos-vaiheeseen"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",Valitettavasti kuponkikoodin voimassaoloaika ei ole alkanut
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,veron perusteena
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: Leave Policy,Leave Policy Details,Jätä politiikkatiedot
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,käytettävä
 DocType: Student,B-,B -
 DocType: Assessment Result,Grade,Arvosana
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 DocType: Restaurant Table,No of Seats,Istumapaikkoja
 DocType: Sales Invoice,Overdue and Discounted,Erääntynyt ja alennettu
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Puhelu katkesi
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Riviväli varten määrä kirjaimin
 DocType: Vehicle,Additional Details,Lisätiedot
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,ei annettua kuvausta
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Hae tuotteet varastosta
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Pyydä ostaa.
 DocType: POS Closing Voucher Details,Collected Amount,Kerätty määrä
 DocType: Lab Test,Submitted Date,Lähetetty päivämäärä
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Käyttö-opastus
 ,Trial Balance (Simple),Koetasapaino (yksinkertainen)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Ota käyttöön laskennallinen kulutus
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Sovellettu kuponkikoodi
 DocType: Asset,Next Depreciation Date,Seuraava poistopäivämäärä
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktiviteetti kustannukset työntekijää kohti
 DocType: Accounts Settings,Settings for Accounts,Tilien asetukset
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Työjärjestys
 DocType: Sales Invoice,Total Qty,yksikkömäärä yhteensä
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 -sähköpostitunnus
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 DocType: Item,Show in Website (Variant),Näytä Web-sivuston (Variant)
 DocType: Employee,Health Concerns,"terveys, huolenaiheet"
 DocType: Payroll Entry,Select Payroll Period,Valitse Payroll Aika
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Verotettavaa tiliä
 DocType: Pricing Rule,Sales Partner,Myyntikumppani
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Kaikki toimittajan tuloskortit.
+DocType: Coupon Code,To be used to get discount,Käytetään alennuksen saamiseksi
 DocType: Buying Settings,Purchase Receipt Required,Saapumistosite vaaditaan
 DocType: Sales Invoice,Rail,kisko
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Todellinen kustannus
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Tuotantosuunnitelma
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Avaustilien luomistyökalu
 DocType: Salary Component,Round to the Nearest Integer,Pyöreä lähimpään kokonaislukuun
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Salli tuotteiden, joita ei ole varastossa, lisääminen ostoskoriin"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Myynti Return
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,"Aseta määrä operaatioihin, jotka perustuvat sarjamuotoiseen tuloon"
 ,Total Stock Summary,Yhteensä Stock Yhteenveto
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company valuutta)
 ,Qty To Be Billed,Määrä laskutettavaksi
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,toimitettu
+DocType: Coupon Code,Gift Card,Lahjakortti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Varattu tuotantomäärä: Raaka-aineiden määrä valmistustuotteiden valmistamiseksi.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Lunastuspäivä
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Tämä pankkitapahtuma on jo täysin sovitettu yhteen
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Luo aikataulu
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,Arvoon sisältyvät kustannukset
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Ostolaskut
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Voit uusia vain, jos jäsenyytesi päättyy 30 päivän kuluessa"
 DocType: Shopping Cart Settings,Show Stock Availability,Saatavuus Varastossa
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Aseta {0} varallisuusluokkaan {1} tai yritys {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Varattu määrä: Myytävänä oleva määrä, mutta ei toimitettu."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Vahvista valinta uudelleen, jos valittua osoitetta muokataan tallennuksen jälkeen"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Varattu määrä alihankintasopimuksille: Raaka-aineiden määrä alihankittujen tuotteiden valmistamiseksi.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Varattu määrä alihankintasopimuksille: Raaka-aineiden määrä alihankittujen tuotteiden valmistamiseksi.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 DocType: Item,Hub Publishing Details,Hub-julkaisutiedot
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','Avattu'
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Tuotteiden tuominen
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lainamäärä
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Lisätty yksityiskohtiin
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",Valitettavasti kuponkikoodi on käytetty loppuun
 DocType: Communication Medium,Catch All,Catch All
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Aikataulu kurssi
 DocType: Budget,Applicable on Material Request,Sovelletaan materiaalihakemukseen
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Virheellinen Taito
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} pitää olla vahvistettu
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Sähköposti-kampanjat
+DocType: Sales Partner,To Track inbound purchase,Seurata saapuvaa hankintaa
 DocType: Buying Settings,Default Supplier Group,Oletuksena toimittajaryhmä
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Suurin sallittu summa komponentille {0} ylittää {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tee osakemerkintä
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellin varaus käyttäjä
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Aseta tila
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; Numerointisarjat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Ole hyvä ja valitse etuliite ensin
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; Sarjojen nimeäminen -kohdassa
 DocType: Contract,Fulfilment Deadline,Täytäntöönpanon määräaika
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Lähellä sinua
 DocType: Student,O-,O -
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Tarkasteltavana
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Sisäänkirjautuminen epäonnistui
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Asetus {0} luotiin
+DocType: Coupon Code,Promotional,myynninedistämis-
 DocType: Special Test Items,Special Test Items,Erityiset testit
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Sinun on oltava käyttäjä, jolla System Manager- ja Item Manager -roolit ovat rekisteröityneet Marketplacessa."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Keskeiset raportit
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,asiakirja tyyppi
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Myyntitiimin yhteensä lasketun prosenttiosuuden pitää olla 100
 DocType: Subscription Plan,Billing Interval Count,Laskutusväli
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Nimitykset ja potilaskokoukset
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Arvo puuttuu
 DocType: Employee,Department and Grade,Osasto ja palkkaluokka
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Alkamis- ja päättymisajankohta
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Sopimusmallin täyttämisen ehdot
 ,Delivered Items To Be Billed,"toimitettu, laskuttamat"
+DocType: Coupon Code,Maximum Use,Suurin käyttö
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Sarjanumerolle ei voi muuttaa varastoa
 DocType: Authorization Rule,Average Discount,Keskimääräinen alennus
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,inventaario
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Lataa nimellä Json
 DocType: Item,Sales Details,Myynnin lisätiedot
+DocType: Coupon Code,Used,käytetty
 DocType: Opportunity,With Items,Tuotteilla
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampanja &#39;{0}&#39; on jo olemassa {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Huoltoryhmä
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",Mitään aktiivista BOM: tä ei löytynyt kohteen {0} kohdalle. Toimitusta \ Serial No ei voida taata
 DocType: Sales Partner,Sales Partner Target,Myyntikumppani tavoite
 DocType: Loan Type,Maximum Loan Amount,Suurin lainamäärä
-DocType: Pricing Rule,Pricing Rule,Hinnoittelusääntö
+DocType: Coupon Code,Pricing Rule,Hinnoittelusääntö
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Päällekkäisiä rullan numero opiskelijan {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Ostotilaus hankintapyynnöstä
 DocType: Company,Default Selling Terms,Oletusmyyntiehdot
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,maksun arvomäärä
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Puolen päivän Päivä pitää olla Työn alkamispäivästä ja Työn päättymispäivästä alkaen
 DocType: Healthcare Settings,Healthcare Service Items,Terveydenhoitopalvelut
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Virheellinen viivakoodi. Tähän viivakoodiin ei ole liitetty tuotetta.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Rahavarojen muutos
 DocType: Assessment Plan,Grading Scale,Arvosteluasteikko
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Omaisuuden tili
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Uuden julkaisupäivän pitäisi olla tulevaisuudessa
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; HR-asetukset
 DocType: Lab Test,Technician Name,Tekniikan nimi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3003,6 +3017,7 @@
 DocType: Products Settings,Hide Variants,Piilota variantit
 DocType: Lead,Next Contact By,seuraava yhteydenottohlö
 DocType: Compensatory Leave Request,Compensatory Leave Request,Korvaushyvityspyyntö
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",Tuotteen {0} rivillä {1} ei voida ylilaskuttaa enemmän kuin {2}. Aseta korvaus Tilin asetukset -kohdassa salliaksesi ylilaskutuksen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Vaadittu tuotemäärä {0} rivillä {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Varastoa {0} ei voi poistaa koska se sisältää tuotetta {1}
 DocType: Blanket Order,Order Type,Tilaustyyppi
@@ -3172,7 +3187,6 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
 DocType: Employee Benefit Claim,Claim Benefit For,Korvausetu
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ei voida ylikirjoittaa rivikohta {0} {1} yli {2}. Jotta voit laskuttaa ylimääräisen hinnan, aseta Tukosasetukset"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Päivitä vastaus
 apps/erpnext/erpnext/public/js/utils.js,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"
@@ -3462,6 +3476,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Määritä yrityksen valuutta
 DocType: Workstation,Wages per hour,Tuntipalkat
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Määritä {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Erän varastotase {0} muuttuu negatiiviseksi {1} tuotteelle {2} varastossa {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat hankintapyynnöt luotu tilauspisteen mukaisesti
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
@@ -3791,6 +3806,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Vahvista palkkatosite
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Pidossa
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Lauseessa on oltava ainakin yksi oikea vaihtoehto
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Tilaukset
 DocType: Account,Inter Company Account,Inter Company Account
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,tuo massana
 DocType: Sales Partner,Address & Contacts,osoitteet ja yhteystiedot
@@ -3801,6 +3817,7 @@
 DocType: POS Profile,[Select],[valitse]
 DocType: Staffing Plan Detail,Number Of Positions,Asemien lukumäärä
 DocType: Vital Signs,Blood Pressure (diastolic),Verenpaine (diastolinen)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Ole hyvä ja valitse asiakas.
 DocType: SMS Log,Sent To,Lähetetty kenelle
 DocType: Agriculture Task,Holiday Management,Lomahallinta
 DocType: Payment Request,Make Sales Invoice,tee myyntilasku
@@ -4010,7 +4027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ei ole vahvistettu
 DocType: Subscription,Trialling,testaamista
 DocType: Sales Invoice Item,Deferred Revenue,Viivästyneet tulot
-DocType: Bank Account,GL Account,GL-tili
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Rahatiliä käytetään myyntilaskutuksen luomiseen
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Poikkeusluokka
 DocType: Member,Membership Expiry Date,Jäsenyyden päättymispäivä
@@ -4414,13 +4430,13 @@
 DocType: C-Form Invoice Detail,Territory,Alue
 DocType: Pricing Rule,Apply Rule On Item Code,Käytä tuotekoodia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Vierailujen määrä vaaditaan
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Varastotaseraportti
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Maksu
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Näytä kumulatiivinen määrä
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Päivitys käynnissä. Voi kestää hetken.
 DocType: Production Plan Item,Produced Qty,Tuotettu määrä
 DocType: Vehicle Log,Fuel Qty,polttoaineen määrä
-DocType: Stock Entry,Target Warehouse Name,Kohdevaraston nimi
 DocType: Work Order Operation,Planned Start Time,Suunniteltu aloitusaika
 DocType: Course,Assessment,Arviointi
 DocType: Payment Entry Reference,Allocated,kohdennettu
@@ -4486,10 +4502,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","perusehdot, jotka voidaan lisätä myynteihin ja ostoihin esim, 1. tarjouksen voimassaolo 1. maksuehdot (ennakko, luotto, osaennakko jne) 1. lisäkulut (asiakkaan maksettavaksi) 1. turvallisuus / käyttövaroitukset 1. takuuasiat 1. palautusoikeus. 1. toimitusehdot 1. riita-, korvaus- ja vastuuasioiden käsittely jne 1. omat osoite ja yhteystiedot"
 DocType: Homepage Section,Section Based On,Jakso perustuu
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Näytä Käytä kuponkikoodia
 DocType: Issue,Issue Type,Julkaisutyyppi
 DocType: Attendance,Leave Type,Vapaan tyyppi
 DocType: Purchase Invoice,Supplier Invoice Details,Toimittaja Laskun tiedot
 DocType: Agriculture Task,Ignore holidays,Ohita vapaapäivät
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Lisää / muokkaa kuponkiehtoja
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kustannus- / erotuksen tili ({0}) tulee olla 'tuloslaskelma' tili
 DocType: Stock Entry Detail,Stock Entry Child,Osakemerkintä lapsi
 DocType: Project,Copied From,kopioitu
@@ -4664,6 +4682,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Assessment Plan Criteria
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,liiketoimet
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Estää ostotilaukset
+DocType: Coupon Code,Coupon Name,Kupongin nimi
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,herkkä
 DocType: Email Campaign,Scheduled,Aikataulutettu
 DocType: Shift Type,Working Hours Calculation Based On,Työajan laskeminen perustuu
@@ -4680,7 +4699,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,tee malleja
 DocType: Vehicle,Diesel,diesel-
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,"Hinnasto, valuutta ole valittu"
+DocType: Quick Stock Balance,Available Quantity,Saatavana oleva määrä
 DocType: Purchase Invoice,Availed ITC Cess,Käytti ITC Cessia
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohdassa Koulutus&gt; Koulutusasetukset
 ,Student Monthly Attendance Sheet,Student Kuukauden Läsnäolo Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Myyntiin sovellettava toimitussääntö
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Poisto Rivi {0}: Seuraava Poistoaika ei voi olla ennen ostopäivää
@@ -4747,8 +4768,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
 DocType: Quality Meeting,Quality Meeting,Laatukokous
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-ryhmän Group
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; Sarjojen nimeäminen -kohdassa
 DocType: Employee,ERPNext User,ERP-lisäkäyttäjä
+DocType: Coupon Code,Coupon Description,Kupongin kuvaus
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Erä on pakollinen rivillä {0}
 DocType: Company,Default Buying Terms,Oletusostoehdot
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Saapumistositteen nimike toimitettu
@@ -4911,6 +4932,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Dokumentin yksityiskohta nro kohdistus
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Poistaminen ei ole sallittua maan {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Osapuoli tyyppi on pakollinen
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Käytä kuponkikoodia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Työkortilla {0} voit tehdä vain valmistusmateriaalin siirron
 DocType: Quality Inspection,Outgoing,Lähtevä
 DocType: Customer Feedback Table,Customer Feedback Table,Asiakaspalautetaulukko
@@ -5060,7 +5082,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ostotilausten toimittaminen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Lisää kaikki toimittajat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rivi # {0}: osuutensa ei voi olla suurempi kuin lainamäärä.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Tally Migration,Parties,osapuolet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Taatut lainat
@@ -5092,7 +5113,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Älä anna asettaa vaihtoehtoista kohdetta {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Valtuutettu allekirjoitus
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus&gt; Koulutusasetukset
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC käytettävissä (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Luo palkkioita
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
@@ -5117,6 +5137,7 @@
 DocType: Quiz Result,Wrong,Väärä
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"taso, jolla hinnasto valuutta muunnetaan asiakkaan käyttämäksi perusvaluutaksi"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),netto (yrityksen valuutassa)
+DocType: Sales Partner,Referral Code,viitekoodi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Ennakkomaksun kokonaismäärä ei voi olla suurempi kuin kokonainen seuraamusmäärä
 DocType: Salary Slip,Hour Rate,tuntitaso
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Ota automaattinen uudelleenjärjestys käyttöön
@@ -5245,6 +5266,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Näytä varastomäärä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Liiketoiminnan nettorahavirta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Rivi # {0}: Tila on oltava {1} laskun alennukselle {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {1}) ei löydy tuotteelle: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Nimike 4
 DocType: Student Admission,Admission End Date,Pääsymaksu Päättymispäivä
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Alihankinta
@@ -5267,6 +5289,7 @@
 DocType: Travel Request,Fully Sponsored,Täysin sponsoroidut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Luo työkortti
+DocType: Quotation,Referral Sales Partner,Suosittelumyyntikumppani
 DocType: Quality Procedure Process,Process Description,Prosessin kuvaus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Asiakas {0} luodaan.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,"Tällä hetkellä ei varastossa,"
@@ -5401,6 +5424,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM taso
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Lähetettyjen tiedostojen lukeminen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Pysäytettyä työjärjestystä ei voi peruuttaa, keskeyttää se ensin peruuttamalla"
+DocType: Coupon Code,Coupon Code,Kuponkikoodi
 DocType: Asset,Journal Entry for Scrap,Journal Entry for Romu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Siirrä tuotteita lähetteeltä
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Rivi {0}: valitse työasema operaatiota vastaan {1}
@@ -5483,6 +5507,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Päivämäärä&#39; vaaditaan
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,tietojen tuonti ja vienti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",Valitettavasti kuponkikoodin voimassaoloaika on vanhentunut
 DocType: Bank Account,Account Details,tilin tiedot
 DocType: Crop,Materials Required,Vaaditut materiaalit
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Ei opiskelijat Todettu
@@ -5520,6 +5545,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Siirry Käyttäjiin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Maksettu arvomäärä + poistotilin summa ei voi olla suurempi kuin kokonaissumma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ei sallittu eränumero tuotteelle {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Anna voimassa oleva kuponkikoodi !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Huom: jäännöstyypille {0} ei ole tarpeeksi vapaata jäännöstasetta
 DocType: Task,Task Description,Tehtävän kuvaus
 DocType: Training Event,Seminar,seminaari
@@ -5783,6 +5809,7 @@
 ,TDS Payable Monthly,TDS maksetaan kuukausittain
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Jouduin korvaamaan BOM. Voi kestää muutaman minuutin.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; HR-asetukset
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Maksut yhteensä
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Sarjanumero tarvitaan sarjanumeroilla seuratulle tuotteelle {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Match Maksut Laskut
@@ -5872,6 +5899,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Hanki raaka-aineita tuotannolle
 DocType: Job Opening,Job Title,Työtehtävä
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Tuleva maksu viite
+DocType: Quotation,Additional Discount and Coupon Code,Lisäalennus ja kuponkikoodi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} ilmoittaa, että {1} ei anna tarjousta, mutta kaikki kohteet on mainittu. RFQ-lainauksen tilan päivittäminen."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Suurin näytteitä - {0} on jo säilytetty erää {1} ja erää {2} erää {3} varten.
@@ -6099,7 +6127,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Verkkosivun kotisivun asetukset
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} on pidossa kunnes {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},"Tarjouspyynnöt eivät ole sallittuja {0}, koska tuloskortin arvo on {1}"
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,tee ostolasku
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Käytetyt lehdet
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Käytetty kuponki on {1}. Sallittu määrä on käytetty loppuun
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Haluatko lähettää materiaalipyynnön?
 DocType: Job Offer,Awaiting Response,Odottaa vastausta
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6113,6 +6143,7 @@
 DocType: Training Event Employee,Optional,Valinnainen
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 DocType: Agriculture Analysis Criteria,Water Analysis,Veden analyysi
+DocType: Sales Order,Skip Delivery Note,Ohita toimitusilmoitus
 DocType: Price List,Price Not UOM Dependent,Hinta ei ole riippuvainen UOM: sta
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} muunnoksia luotu.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Oletuksena oleva palvelutasosopimus on jo olemassa.
@@ -6217,6 +6248,7 @@
 DocType: Vehicle,Last Carbon Check,Viimeksi Carbon Tarkista
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Juridiset kustannukset
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Valitse määrä rivillä
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Työmääräys {0}: työkorttia ei löydy operaatiosta {1}
 DocType: Purchase Invoice,Posting Time,Tositeaika
 DocType: Timesheet,% Amount Billed,% laskutettu arvomäärä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Puhelinkulut
@@ -6319,7 +6351,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Lisätyt verot ja maksut
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Poistojauhe {0}: Seuraava Poistoaika ei voi olla ennen Käytettävissä olevaa päivämäärää
 ,Sales Funnel,Myyntihankekantaan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,kori
@@ -6414,6 +6445,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Hyvyyspisteet lasketaan vietyistä (myyntilaskun kautta), jotka perustuvat mainittuun keräyskertoimeen."
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
+DocType: Pricing Rule,Coupon Code Based,Kupongikoodi perustuu
 DocType: Company,HRA Settings,HRA-asetukset
 DocType: Homepage,Hero Section,Sankariosa
 DocType: Employee Transfer,Transfer Date,Siirtoaika
@@ -6529,6 +6561,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Aseta Yritysfiltteri tyhjäksi jos Ryhmittelyperuste on &#39;yritys&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Kirjoittamisen päivämäärä ei voi olla tulevaisuudessa
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Rivi # {0}: Sarjanumero {1} ei vastaa {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; Numerointisarjat
 DocType: Stock Entry,Target Warehouse Address,Kohdevaraston osoite
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,tavallinen poistuminen
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Aika ennen vuoron alkamisaikaa, jonka aikana työntekijän lähtöselvitystä pidetään läsnäolona."
@@ -6563,7 +6596,6 @@
 DocType: Employee Grade,Employee Grade,Työntekijäluokka
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Urakkatyö
 DocType: GSTR 3B Report,June,kesäkuu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Share Balance,From No,Nro
 DocType: Shift Type,Early Exit Grace Period,Varhaisvaroitusaika
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
@@ -6854,7 +6886,6 @@
 DocType: Warehouse,Warehouse Name,Varaston nimi
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {1}) ei löydy tuotteelle: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Palvelutasosopimus entiteettityypin {0} ja kokonaisuuden {1} kanssa on jo olemassa.
 DocType: Journal Entry,Write Off Entry,Poiston kirjaus
 DocType: BOM,Rate Of Materials Based On,Materiaalilaskenta perustuen
@@ -6992,6 +7023,7 @@
 DocType: Budget,Warn,Varoita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Kaikki kohteet on jo siirretty tähän työjärjestykseen.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
+DocType: Bank Account,Company Account,Yritystili
 DocType: Asset Maintenance,Manufacturing User,Valmistus peruskäyttäjä
 DocType: Purchase Invoice,Raw Materials Supplied,Raaka-aineet toimitettu
 DocType: Subscription Plan,Payment Plan,Maksusuunnitelma
@@ -7033,6 +7065,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ei voi olla suurempi kuin suunniteltu määrä ({2}) Työjärjestyksessä {3}
 DocType: Certification Application,Name of Applicant,Hakijan nimi
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Valmistuksen tuntilista
+DocType: Quick Stock Balance,Quick Stock Balance,Nopea varastotase
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Välisumma
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Vaihtoehtoisia ominaisuuksia ei voi muuttaa varastotoiminnan jälkeen. Sinun täytyy tehdä uusi esine tehdä tämä.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA-toimeksianto
@@ -7359,6 +7392,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Aseta {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ei ole aktiivinen opiskelija
 DocType: Employee,Health Details,"terveys, lisätiedot"
+DocType: Coupon Code,Coupon Type,Kupongin tyyppi
 DocType: Leave Encashment,Encashable days,Syytettävät päivät
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Luoda maksatuspyyntö viiteasiakirja tarvitaan
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7641,6 +7675,7 @@
 DocType: Hotel Room Package,Amenities,palveluihin
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Hae maksuehdot automaattisesti
 DocType: QuickBooks Migrator,Undeposited Funds Account,Undeposited Funds Account
+DocType: Coupon Code,Uses,käyttötarkoitukset
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Useita oletusmaksutapoja ei sallita
 DocType: Sales Invoice,Loyalty Points Redemption,Uskollisuuspisteiden lunastus
 ,Appointment Analytics,Nimitys Analytics
@@ -7657,6 +7692,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Kokonaisbudjetti
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Jätä tyhjäksi jos teet opiskelijoiden ryhmää vuodessa
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",täpättäessä lomapäivät sisältyvät työpäiviin ja tämä lisää palkan avoa / päivä
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Verkkotunnuksen lisääminen epäonnistui
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",Päivitä &quot;Yli kuitti / toimituskorvaus&quot; varastosäädöissä tai tuotteessa salliaksesi ylivastaanoton / toimituksen.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Nykyisen avaimen käyttämät sovellukset eivät voi käyttää, oletko varma?"
 DocType: Subscription Settings,Prorate,ositussopimuksen
@@ -7669,6 +7705,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Jos määritettyä aikaväliä ei ole, tämä ryhmä hoitaa viestinnän"
 DocType: Stock Reconciliation Item,Quantity Difference,Määrä ero
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Opportunity Item,Basic Rate,perushinta
 DocType: GL Entry,Credit Amount,Luoton määrä
 ,Electronic Invoice Register,Sähköinen laskurekisteri
@@ -7922,6 +7959,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Netto ilman veroja ja kuluja (yrityksen valuutassa)
 DocType: Item Group,General Settings,pääasetukset
 DocType: Article,Article,Artikla
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Anna kuponkikoodi !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Lähde- ja kohdevaluutta eivät voi olla samoja
 DocType: Taxable Salary Slab,Percent Deduction,Prosentuaalinen vähennys
 DocType: GL Entry,To Rename,Nimeä uudelleen
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 346765f..874bfb0 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Contact Client
 DocType: Shift Type,Enable Auto Attendance,Activer la présence automatique
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Veuillez entrer entrepôt et date
 DocType: Lost Reason Detail,Opportunity Lost Reason,Raison perdue
 DocType: Patient Appointment,Check availability,Voir les Disponibilités
 DocType: Retention Bonus,Bonus Payment Date,Date de paiement du bonus
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Ordres de travail terminés
 DocType: Support Settings,Forum Posts,Messages du forum
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","La tâche a été mise en file d&#39;attente en tant que tâche en arrière-plan. En cas de problème de traitement en arrière-plan, le système ajoute un commentaire concernant l&#39;erreur sur ce rapprochement des stocks et revient au stade de brouillon."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Désolé, la validité du code promo n&#39;a pas commencé"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Montant Taxable
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Détails de la politique de congé
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consommable
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Echelon
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Restaurant Table,No of Seats,Nombre de Sièges
 DocType: Sales Invoice,Overdue and Discounted,En retard et à prix réduit
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Appel déconnecté
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Espacement des lignes pour le montant en lettres
 DocType: Vehicle,Additional Details,Détails Supplémentaires
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Aucune Description
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Récupérer des articles de l&#39;entrepôt
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Demande d'Achat.
 DocType: POS Closing Voucher Details,Collected Amount,Montant collecté
 DocType: Lab Test,Submitted Date,Date Soumise
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Apprendre
 ,Trial Balance (Simple),Balance d&#39;essai (simple)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Activer les frais reportés
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Code de coupon appliqué
 DocType: Asset,Next Depreciation Date,Date de l’Amortissement Suivant
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Coût de l'Activité par Employé
 DocType: Accounts Settings,Settings for Accounts,Paramètres des Comptes
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Ordre de Travail
 DocType: Sales Invoice,Total Qty,Qté Totale
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email du Tuteur2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 DocType: Item,Show in Website (Variant),Afficher dans le Website (Variant)
 DocType: Employee,Health Concerns,Problèmes de Santé
 DocType: Payroll Entry,Select Payroll Period,Sélectionner la Période de Paie
@@ -1014,6 +1017,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Compte de taxation à la source
 DocType: Pricing Rule,Sales Partner,Partenaire Commercial
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Toutes les Fiches d'Évaluation Fournisseurs.
+DocType: Coupon Code,To be used to get discount,Pour être utilisé pour obtenir une réduction
 DocType: Buying Settings,Purchase Receipt Required,Reçu d’Achat Requis
 DocType: Sales Invoice,Rail,Rail
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Prix actuel
@@ -1064,6 +1068,7 @@
 DocType: Production Plan,Production Plan,Plan de production
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Ouverture de l&#39;outil de création de facture
 DocType: Salary Component,Round to the Nearest Integer,Arrondir à l&#39;entier le plus proche
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Autoriser les articles non en stock à être ajoutés au panier
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Retour de Ventes
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Définir la quantité dans les transactions en fonction des données du numéro de série
 ,Total Stock Summary,Récapitulatif de l'Inventaire Total
@@ -1193,6 +1198,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Taux Horaire de Base (Devise de la Société)
 ,Qty To Be Billed,Qté à facturer
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Montant Livré
+DocType: Coupon Code,Gift Card,Carte cadeau
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qté réservée à la production: quantité de matières premières permettant de fabriquer des articles de fabrication.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Date de l'échange
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Cette transaction bancaire est déjà totalement réconciliée
@@ -1280,6 +1286,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Créer une feuille de temps
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
 DocType: Account,Expenses Included In Valuation,Charges Incluses dans la Valorisation
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Factures d&#39;achat
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Vous ne pouvez renouveler que si votre abonnement expire dans les 30 jours
 DocType: Shopping Cart Settings,Show Stock Availability,Afficher la disponibilité du stock
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Définissez {0} dans la catégorie d&#39;actifs {1} ou la société {2}
@@ -1576,7 +1583,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Réservés Quantité: Quantité de commande pour la vente , mais pas livré ."
 DocType: Drug Prescription,Interval UOM,UDM d'Intervalle
 DocType: Customer,"Reselect, if the chosen address is edited after save","Re-sélectionner, si l'adresse choisie est éditée après l'enregistrement"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Qté réservée aux sous-traitants: quantité de matières premières permettant de fabriquer des articles sous-traités.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qté réservée aux sous-traitants: quantité de matières premières permettant de fabriquer des articles sous-traités.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
 DocType: Item,Hub Publishing Details,Détails Publiés sur le Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','Ouverture'
@@ -1839,6 +1846,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Importer des articles et des UOM
 DocType: Repayment Schedule,Balance Loan Amount,Solde du Montant du Prêt
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Ajouté aux détails
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Désolé, le code de coupon est épuisé"
 DocType: Communication Medium,Catch All,Attraper tout
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Cours Calendrier
 DocType: Budget,Applicable on Material Request,Applicable sur la base des requêtes de matériel
@@ -2006,6 +2014,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Attribut Invalide
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} doit être soumis
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Campagnes de courrier électronique
+DocType: Sales Partner,To Track inbound purchase,Pour suivre les achats entrants
 DocType: Buying Settings,Default Supplier Group,Groupe de fournisseurs par défaut
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Le montant maximal éligible pour le composant {0} dépasse {1}
@@ -2161,8 +2170,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Faire une entrée de stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilisateur chargé des réservations d'hôtel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Définir le statut
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Veuillez d’abord sélectionner un préfixe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 DocType: Contract,Fulfilment Deadline,Délai d&#39;exécution
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Près de toi
 DocType: Student,O-,O-
@@ -2286,6 +2295,7 @@
 DocType: Quality Meeting Table,Under Review,À l&#39;étude
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Échec de la connexion
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Actif {0} créé
+DocType: Coupon Code,Promotional,Promotionnel
 DocType: Special Test Items,Special Test Items,Articles de Test Spécial
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Vous devez être un utilisateur avec des rôles System Manager et Item Manager pour vous inscrire sur Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Rapports clés
@@ -2323,6 +2333,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Type de document
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Pourcentage total attribué à l'équipe commerciale devrait être de 100
 DocType: Subscription Plan,Billing Interval Count,Nombre d&#39;intervalles de facturation
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Rendez-vous et consultations patients
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Valeur manquante
 DocType: Employee,Department and Grade,Département et échelon
@@ -2425,6 +2437,7 @@
 DocType: Project,Start and End Dates,Dates de Début et de Fin
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Conditions d'exécution du modèle de contrat
 ,Delivered Items To Be Billed,Articles Livrés à Facturer
+DocType: Coupon Code,Maximum Use,Utilisation maximale
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Ouvrir LDM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,L'entrepôt ne peut être modifié pour le N° de Série
 DocType: Authorization Rule,Average Discount,Remise Moyenne
@@ -2586,6 +2599,7 @@
 DocType: Item,Inventory,Inventaire
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Télécharger en Json
 DocType: Item,Sales Details,Détails Ventes
+DocType: Coupon Code,Used,Utilisé
 DocType: Opportunity,With Items,Avec Articles
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',La campagne &#39;{0}&#39; existe déjà pour le {1} &#39;{2}&#39;.
 DocType: Asset Maintenance,Maintenance Team,Équipe de maintenance
@@ -2715,7 +2729,7 @@
 						Serial No cannot be ensured",Aucune nomenclature active trouvée pour l&#39;article {0}. La livraison par \ Serial No ne peut être assurée
 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
+DocType: Coupon Code,Pricing Rule,Règle de Tarification
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Numéro de liste en double pour l'élève {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Demande de Matériel au Bon de Commande
 DocType: Company,Default Selling Terms,Conditions de vente par défaut
@@ -2794,6 +2808,7 @@
 DocType: Payment Schedule,Payment Amount,Montant du paiement
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,La date de la demi-journée doit être comprise entre la date du début du travail et la date de fin du travail
 DocType: Healthcare Settings,Healthcare Service Items,Articles de service de soins de santé
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Code à barres invalide. Il n&#39;y a pas d&#39;article attaché à ce code à barres.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Montant Consommé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Variation Nette de Trésorerie
 DocType: Assessment Plan,Grading Scale,Échelle de Notation
@@ -2913,7 +2928,6 @@
 DocType: Share Transfer,Asset Account,Compte d&#39;actif
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nouvelle date de sortie devrait être dans le futur
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Lab Test,Technician Name,Nom du Technicien
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3024,6 +3038,7 @@
 DocType: Products Settings,Hide Variants,Masquer les variantes
 DocType: Lead,Next Contact By,Contact Suivant Par
 DocType: Compensatory Leave Request,Compensatory Leave Request,Demande de congé compensatoire
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","La surfacturation pour le poste {0} dans la ligne {1} ne peut pas dépasser {2}. Pour autoriser la surfacturation, définissez la provision dans les paramètres du compte."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Quantité requise pour l'Article {0} à la ligne {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},L'entrepôt {0} ne peut pas être supprimé car il existe une quantité pour l'Article {1}
 DocType: Blanket Order,Order Type,Type de Commande
@@ -3193,7 +3208,6 @@
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
 DocType: Employee Benefit Claim,Claim Benefit For,Demande de prestations pour
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossible de surfacturer plus de {2} pour l'article {0} de la ligne {1}. Pour autoriser la surfacturation, veuillez définir les paramètres du stock."
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Mettre à jour la Réponse
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3484,6 +3498,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Veuillez spécifier la devise de la Société
 DocType: Workstation,Wages per hour,Salaires par heure
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Configurer {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Solde du stock dans le Lot {0} deviendra négatif {1} pour l'Article {2} à l'Entrepôt {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Les Demandes de Matériel suivantes ont été créées automatiquement sur la base du niveau de réapprovisionnement de l’Article
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
@@ -3813,6 +3828,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Soumettre la Fiche de Paie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,En attente
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Une qustion doit avoir au moins une des options correctes
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Acheter en ligne
 DocType: Account,Inter Company Account,Compte inter-sociétés
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Importer en Masse
 DocType: Sales Partner,Address & Contacts,Adresse &amp; Contacts
@@ -3823,6 +3839,7 @@
 DocType: POS Profile,[Select],[Choisir]
 DocType: Staffing Plan Detail,Number Of Positions,Nombre de postes
 DocType: Vital Signs,Blood Pressure (diastolic),Pression Artérielle (Diastolique)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,S&#39;il vous plaît sélectionner le client.
 DocType: SMS Log,Sent To,Envoyé À
 DocType: Agriculture Task,Holiday Management,Gestion des vacances
 DocType: Payment Request,Make Sales Invoice,Faire des Factures de Vente
@@ -4032,7 +4049,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} n'a pas été soumis
 DocType: Subscription,Trialling,Essai
 DocType: Sales Invoice Item,Deferred Revenue,Produits comptabilisés d'avance
-DocType: Bank Account,GL Account,Compte GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Le compte de caisse sera utilisé pour la création de la facture de vente
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Sous-catégorie d&#39;exemption
 DocType: Member,Membership Expiry Date,Date d&#39;expiration de l&#39;adhésion
@@ -4456,13 +4472,13 @@
 DocType: C-Form Invoice Detail,Territory,Région
 DocType: Pricing Rule,Apply Rule On Item Code,Appliquer la règle sur le code d&#39;article
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Veuillez indiquer le nb de visites requises
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Rapport de solde des stocks
 DocType: Stock Settings,Default Valuation Method,Méthode de Valorisation par Défaut
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Frais
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Afficher le montant cumulatif
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Mise à jour en cours. Ça peut prendre un moment.
 DocType: Production Plan Item,Produced Qty,Quantité produite
 DocType: Vehicle Log,Fuel Qty,Qté Carburant
-DocType: Stock Entry,Target Warehouse Name,Nom de l&#39;entrepôt cible
 DocType: Work Order Operation,Planned Start Time,Heure de Début Prévue
 DocType: Course,Assessment,Évaluation
 DocType: Payment Entry Reference,Allocated,Alloué
@@ -4540,10 +4556,12 @@
 7. Règlement des litiges, indemnisation, responsabilité, etc. 
 8. Adresse et Contact de votre Société."
 DocType: Homepage Section,Section Based On,Section basée sur
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Afficher appliquer le code de coupon
 DocType: Issue,Issue Type,Type de ticket
 DocType: Attendance,Leave Type,Type de Congé
 DocType: Purchase Invoice,Supplier Invoice Details,Détails de la Facture du Fournisseur
 DocType: Agriculture Task,Ignore holidays,Ignorer les vacances
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Ajouter / Modifier les conditions du coupon
 apps/erpnext/erpnext/controllers/stock_controller.py,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: Stock Entry Detail,Stock Entry Child,Entrée de stock enfant
 DocType: Project,Copied From,Copié Depuis
@@ -4718,6 +4736,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Critères du Plan d'Évaluation
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transactions
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Interdire les Bons de Commande d'Achat
+DocType: Coupon Code,Coupon Name,Nom du coupon
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Sensible
 DocType: Email Campaign,Scheduled,Prévu
 DocType: Shift Type,Working Hours Calculation Based On,Calcul des heures de travail basé sur
@@ -4734,7 +4753,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Créer des variantes
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Devise de la Liste de Prix non sélectionnée
+DocType: Quick Stock Balance,Available Quantity,quantité disponible
 DocType: Purchase Invoice,Availed ITC Cess,ITC Cess utilisé
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 ,Student Monthly Attendance Sheet,Feuille de Présence Mensuelle des Étudiants
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Règle d&#39;expédition applicable uniquement pour la vente
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Ligne d&#39;amortissement {0}: La date d&#39;amortissement suivante ne peut pas être antérieure à la date d&#39;achat
@@ -4801,8 +4822,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ligne {0} : L’Avance du Client doit être un crédit
 DocType: Quality Meeting,Quality Meeting,Réunion de qualité
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Groupe à Groupe
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 DocType: Employee,ERPNext User,Utilisateur ERPNext
+DocType: Coupon Code,Coupon Description,Description du coupon
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Le lot est obligatoire dans la ligne {0}
 DocType: Company,Default Buying Terms,Conditions d&#39;achat par défaut
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Articles Fournis du Reçus d’Achat
@@ -4965,6 +4986,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Pour le Détail du Document N°
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La suppression n&#39;est pas autorisée pour le pays {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Type de Tiers Obligatoire
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Appliquer le code de coupon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Pour la carte de travail {0}, vous pouvez uniquement saisir une entrée de stock de type &quot;Transfert d&#39;article pour fabrication&quot;."
 DocType: Quality Inspection,Outgoing,Sortant
 DocType: Customer Feedback Table,Customer Feedback Table,Tableau de commentaires des clients
@@ -5114,7 +5136,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Sur soumission de commande
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Ajouter tous les Fournisseurs
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ligne # {0}: montant attribué ne peut pas être supérieur au montant en souffrance.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Tally Migration,Parties,Des soirées
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Parcourir la LDM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prêts Garantis
@@ -5146,7 +5167,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne permet pas de définir un autre article pour l'article {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La Date est répétée
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Signataire Autorisé
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),CTI net disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Créer des Honoraires
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d'Achat Total (via Facture d'Achat)
@@ -5171,6 +5191,7 @@
 DocType: Quiz Result,Wrong,Faux
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Taux auquel la devise de la Liste de prix est convertie en devise du client de base
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Montant Net (Devise Société)
+DocType: Sales Partner,Referral Code,Code de Parrainage
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Le montant total de l'avance ne peut être supérieur au montant total approuvé
 DocType: Salary Slip,Hour Rate,Tarif Horaire
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Activer la re-commande automatique
@@ -5299,6 +5320,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Afficher la quantité en stock
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Trésorerie Nette des Opérations
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Ligne n ° {0}: l&#39;état doit être {1} pour l&#39;actualisation de facture {2}.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Article 4
 DocType: Student Admission,Admission End Date,Date de Fin de l'Admission
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Sous-traitant
@@ -5321,6 +5343,7 @@
 DocType: Travel Request,Fully Sponsored,Entièrement commandité
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Ecriture de journal de contre-passation
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Créer une carte de travail
+DocType: Quotation,Referral Sales Partner,Partenaire commercial de référence
 DocType: Quality Procedure Process,Process Description,Description du processus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Le client {0} est créé.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,"Actuellement, aucun stock disponible dans aucun entrepôt"
@@ -5455,6 +5478,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Taux LDM
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Lecture du fichier téléchargé
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Un ordre de travail arrêté ne peut être annulé, Re-démarrez le pour pouvoir l'annuler"
+DocType: Coupon Code,Coupon Code,Code de coupon
 DocType: Asset,Journal Entry for Scrap,Écriture de Journal pour la Mise au Rebut
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Veuillez récupérer les articles des Bons de Livraison
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Ligne {0}: sélectionnez le poste de travail en fonction de l&#39;opération {1}
@@ -5537,6 +5561,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Date&#39; est requis
 apps/erpnext/erpnext/accounts/party.py,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/settings.py,Data Import and Export,Importer et Exporter des Données
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Désolé, la validité du code promo a expiré"
 DocType: Bank Account,Account Details,Détails du compte
 DocType: Crop,Materials Required,Matériaux nécessaires
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Aucun étudiant Trouvé
@@ -5574,6 +5599,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Aller aux Utilisateurs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Le Montant Payé + Montant Repris ne peut pas être supérieur au Total Général
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} n'est pas un Numéro de Lot valide pour l’Article {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Veuillez entrer un code de coupon valide !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Remarque : Le solde de congé est insuffisant pour le Type de Congé {0}
 DocType: Task,Task Description,Description de la tâche
 DocType: Training Event,Seminar,Séminaire
@@ -5837,6 +5863,7 @@
 ,TDS Payable Monthly,TDS Payable Monthly
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,En file d'attente pour remplacer la LDM. Cela peut prendre quelques minutes.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,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/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Total des paiements
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},N° de Séries Requis pour Article Sérialisé {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Rapprocher les Paiements avec les Factures
@@ -5926,6 +5953,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Obtenir des matières premières pour la production
 DocType: Job Opening,Job Title,Titre de l'Emploi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Paiement futur Ref
+DocType: Quotation,Additional Discount and Coupon Code,Code de réduction et de coupon supplémentaire
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indique que {1} ne fournira pas de devis, mais tous les articles \ ont été évalués. Mise à jour du statut de devis RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Nombre maximum d&#39;échantillons - {0} ont déjà été conservés pour le lot {1} et l&#39;article {2} dans le lot {3}.
@@ -6153,7 +6181,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Paramètres de la page d'accueil du site
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} est en attente jusqu&#39;à {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Les Appels d'Offres ne sont pas autorisés pour {0} en raison d'une note de {1} sur la fiche d'évaluation
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Faire la facture d'achat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Congés utilisés
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,Le {0} coupon utilisé est {1}. La quantité autorisée est épuisée
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Voulez-vous soumettre la demande de matériel
 DocType: Job Offer,Awaiting Response,Attente de Réponse
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.AAAA.-
@@ -6167,6 +6197,7 @@
 DocType: Training Event Employee,Optional,Optionnel
 DocType: Salary Slip,Earning & Deduction,Revenus et Déduction
 DocType: Agriculture Analysis Criteria,Water Analysis,Analyse de l&#39;eau
+DocType: Sales Order,Skip Delivery Note,Ignorer le bon de livraison
 DocType: Price List,Price Not UOM Dependent,Prix non dépendant de l&#39;UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} variantes créées.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Un accord de niveau de service par défaut existe déjà.
@@ -6271,6 +6302,7 @@
 DocType: Vehicle,Last Carbon Check,Dernière Vérification Carbone
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Frais Juridiques
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Veuillez sélectionner la quantité sur la ligne
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Bon de travail {0}: carte de travail non trouvée pour l&#39;opération {1}
 DocType: Purchase Invoice,Posting Time,Heure de Publication
 DocType: Timesheet,% Amount Billed,% Montant Facturé
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Frais Téléphoniques
@@ -6373,7 +6405,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et Frais Additionnels
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Ligne d'amortissement {0}: La date d'amortissement suivante ne peut pas être antérieure à la date de mise en service
 ,Sales Funnel,Entonnoir de Vente
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,Progression de la Tâche
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Panier
@@ -6468,6 +6499,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Les points de fidélité seront calculés à partir des dépenses effectuées (via la facture), en fonction du facteur de collecte sélectionné."
 DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
+DocType: Pricing Rule,Coupon Code Based,Code de coupon basé
 DocType: Company,HRA Settings,Paramètres de l'allocation logement (HRA)
 DocType: Homepage,Hero Section,Section de héros
 DocType: Employee Transfer,Transfer Date,Date de transfert
@@ -6583,6 +6615,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Veuillez laisser le filtre de la Société vide si Group By est 'Société'
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,La Date de Publication ne peut pas être une date future
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0} : N° de série {1} ne correspond pas à {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 DocType: Stock Entry,Target Warehouse Address,Adresse de l&#39;entrepôt cible
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Congé Occasionnel
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Heure avant l&#39;heure de début du quart pendant laquelle l&#39;enregistrement des employés est pris en compte pour la présence.
@@ -6617,7 +6650,6 @@
 DocType: Employee Grade,Employee Grade,Echelon des employés
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Travail à la Pièce
 DocType: GSTR 3B Report,June,juin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Share Balance,From No,Du No
 DocType: Shift Type,Early Exit Grace Period,Période de grâce de sortie anticipée
 DocType: Task,Actual Time (in Hours),Temps Réel (en Heures)
@@ -6903,7 +6935,6 @@
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,L&#39;accord de niveau de service avec le type d&#39;entité {0} et l&#39;entité {1} existe déjà.
 DocType: Journal Entry,Write Off Entry,Écriture de Reprise
 DocType: BOM,Rate Of Materials Based On,Prix des Matériaux Basé sur
@@ -7041,6 +7072,7 @@
 DocType: Budget,Warn,Avertir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Tous les articles ont déjà été transférés pour cet ordre de travail.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers."
+DocType: Bank Account,Company Account,Compte d&#39;entreprise
 DocType: Asset Maintenance,Manufacturing User,Chargé de Production
 DocType: Purchase Invoice,Raw Materials Supplied,Matières Premières Fournies
 DocType: Subscription Plan,Payment Plan,Plan de paiement
@@ -7082,6 +7114,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne peut pas être supérieur à la quantité planifiée ({2}) dans l'ordre de travail {3}
 DocType: Certification Application,Name of Applicant,Nom du candidat
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Feuille de Temps pour la production.
+DocType: Quick Stock Balance,Quick Stock Balance,Solde rapide des stocks
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Sous-Total
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Impossible de modifier les propriétés de variante après une transaction de stock. Vous devrez créer un nouvel article pour pouvoir le faire.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,Mandat SEPA GoCardless
@@ -7407,6 +7440,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Veuillez définir {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 DocType: Employee,Health Details,Détails de Santé
+DocType: Coupon Code,Coupon Type,Type de coupon
 DocType: Leave Encashment,Encashable days,Jours encaissables
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis"
 DocType: Soil Texture,Sandy Clay,Argile sableuse
@@ -7689,6 +7723,7 @@
 DocType: Hotel Room Package,Amenities,Équipements
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Récupérer automatiquement les conditions de paiement
 DocType: QuickBooks Migrator,Undeposited Funds Account,Compte de fonds non déposés
+DocType: Coupon Code,Uses,Les usages
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,De multiples modes de paiement par défaut ne sont pas autorisés
 DocType: Sales Invoice,Loyalty Points Redemption,Utilisation des points de fidélité
 ,Appointment Analytics,Analyse des Rendez-Vous
@@ -7705,6 +7740,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Budget total
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laisser vide si vous faites des groupes d'étudiants par année
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si cochée, Le nombre total de Jours Ouvrés comprendra les vacances, ce qui réduira la valeur du Salaire Par Jour"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Impossible d&#39;ajouter le domaine
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Pour autoriser le dépassement de réception / livraison, mettez à jour &quot;Limite de dépassement de réception / livraison&quot; dans les paramètres de stock ou le poste."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Les applications utilisant la clé actuelle ne pourront plus y accéder, êtes-vous sûr?"
 DocType: Subscription Settings,Prorate,Calculer au prorata
@@ -7717,6 +7753,7 @@
 ,BOM Stock Report,Rapport de Stock de LDM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","S&#39;il n&#39;y a pas d&#39;intervalle de temps attribué, la communication sera gérée par ce groupe."
 DocType: Stock Reconciliation Item,Quantity Difference,Différence de Quantité
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Opportunity Item,Basic Rate,Taux de Base
 DocType: GL Entry,Credit Amount,Montant du Crédit
 ,Electronic Invoice Register,Registre de facture électronique
@@ -7970,6 +8007,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Taxes et Frais Déductibles (Devise Société)
 DocType: Item Group,General Settings,Paramètres Généraux
 DocType: Article,Article,Article
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,S&#39;il vous plaît entrer le code coupon !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,La Devise de Base et la Devise de Cotation ne peuvent pas identiques
 DocType: Taxable Salary Slab,Percent Deduction,Pourcentage de déduction
 DocType: GL Entry,To Rename,Renommer
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index d1d98ac..ffc0c4f 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,મેટ-ડીટી-. વાયવાયવાય.-
 DocType: Purchase Order,Customer Contact,ગ્રાહક સંપર્ક
 DocType: Shift Type,Enable Auto Attendance,Autoટો હાજરીને સક્ષમ કરો
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,કૃપા કરીને વેરહાઉસ અને તારીખ દાખલ કરો
 DocType: Lost Reason Detail,Opportunity Lost Reason,તકો ગુમાવેલ કારણ
 DocType: Patient Appointment,Check availability,ઉપલબ્ધતા તપાસો
 DocType: Retention Bonus,Bonus Payment Date,બોનસ ચુકવણી તારીખ
@@ -262,6 +263,7 @@
 ,Completed Work Orders,પૂર્ણ કાર્ય ઓર્ડર્સ
 DocType: Support Settings,Forum Posts,ફોરમ પોસ્ટ્સ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","કાર્યને પૃષ્ઠભૂમિની નોકરી તરીકે ગોઠવવામાં આવ્યું છે. પૃષ્ઠભૂમિમાં પ્રક્રિયા કરવામાં કોઈ સમસ્યા હોવાના કિસ્સામાં, સિસ્ટમ આ સ્ટોક સમાધાન પરની ભૂલ વિશે ટિપ્પણી ઉમેરશે અને ડ્રાફ્ટ સ્ટેજ પર પાછા આવશે."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","માફ કરશો, કૂપન કોડ માન્યતા પ્રારંભ થઈ નથી"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,કરપાત્ર રકમ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: Leave Policy,Leave Policy Details,નીતિ વિગતો છોડો
@@ -326,6 +328,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ઉપભોજ્ય
 DocType: Student,B-,બી
 DocType: Assessment Result,Grade,ગ્રેડ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 DocType: Restaurant Table,No of Seats,બેઠકોની સંખ્યા
 DocType: Sales Invoice,Overdue and Discounted,ઓવરડ્યુ અને ડિસ્કાઉન્ટેડ
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,ક Callલ ડિસ્કનેક્ટેડ
@@ -501,6 +504,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,શબ્દોમાં રકમ માટે લાઇન અંતર
 DocType: Vehicle,Additional Details,વધારાની વિગતો
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,આપવામાં કોઈ વર્ણન
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,વેરહાઉસમાંથી આઇટમ્સ લાવો
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,ખરીદી માટે વિનંતી.
 DocType: POS Closing Voucher Details,Collected Amount,એકત્રિત રકમ
 DocType: Lab Test,Submitted Date,સબમિટ કરેલી તારીખ
@@ -607,6 +611,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,જાણો
 ,Trial Balance (Simple),ટ્રાયલ બેલેન્સ (સરળ)
 DocType: Purchase Invoice Item,Enable Deferred Expense,ડિફરર્ડ ખર્ચ સક્ષમ કરો
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,લાગુ કુપન કોડ
 DocType: Asset,Next Depreciation Date,આગળ અવમૂલ્યન તારીખ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,કર્મચારી દીઠ પ્રવૃત્તિ કિંમત
 DocType: Accounts Settings,Settings for Accounts,એકાઉન્ટ્સ માટે સુયોજનો
@@ -837,8 +842,6 @@
 DocType: BOM,Work Order,વર્ક ઓર્ડર
 DocType: Sales Invoice,Total Qty,કુલ Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ઇમેઇલ આઈડી
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 DocType: Item,Show in Website (Variant),વેબસાઇટ બતાવો (variant)
 DocType: Employee,Health Concerns,આરોગ્ય ચિંતા
 DocType: Payroll Entry,Select Payroll Period,પગારપત્રક અવધિ પસંદ
@@ -1000,6 +1003,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,ટેક્સ રોકવાનો એકાઉન્ટ
 DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,બધા પુરવઠોકર્તા સ્કોરકાર્ડ્સ.
+DocType: Coupon Code,To be used to get discount,ડિસ્કાઉન્ટ મેળવવા માટે ઉપયોગમાં લેવાય છે
 DocType: Buying Settings,Purchase Receipt Required,ખરીદી રસીદ જરૂરી
 DocType: Sales Invoice,Rail,રેલ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,વાસ્તવિક કિંમત
@@ -1049,6 +1053,7 @@
 DocType: Production Plan,Production Plan,ઉત્પાદન યોજના
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ઇન્વોઇસ બનાવટ ટૂલ ખુલે છે
 DocType: Salary Component,Round to the Nearest Integer,નજીકના પૂર્ણાંક માટેનો ગોળ
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,સ્ટોકમાં ન હોય તેવી આઇટમ્સને કાર્ટમાં ઉમેરવાની મંજૂરી આપો
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,વેચાણ પરત
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,સીરીઅલ ઇનપુટ પર આધારિત વ્યવહારોમાં જથ્થો સેટ કરો
 ,Total Stock Summary,કુલ સ્ટોક સારાંશ
@@ -1175,6 +1180,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),આધાર કલાક રેટ (કંપની ચલણ)
 ,Qty To Be Billed,બીટી બરાબર ક્વોટી
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,વિતરિત રકમ
+DocType: Coupon Code,Gift Card,ગિફ્ટ કાર્ડ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ઉત્પાદન માટે અનામત ક્વોટી: ઉત્પાદન વસ્તુઓ બનાવવા માટે કાચી સામગ્રીનો જથ્થો.
 DocType: Loyalty Point Entry Redemption,Redemption Date,રીડેમ્પશન તારીખ
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,આ બેંક વ્યવહાર પહેલાથી સંપૂર્ણ રીતે સમાધાન થયેલ છે
@@ -1261,6 +1267,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,ટાઇમ્સશીટ બનાવો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,ઇન્વicesઇસેસ ખરીદો
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,જો તમારી સદસ્યતા 30 દિવસની અંદર સમાપ્ત થઈ જાય તો તમે માત્ર રિન્યુ કરી શકો છો
 DocType: Shopping Cart Settings,Show Stock Availability,સ્ટોક ઉપલબ્ધતા બતાવો
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},એસેટ કેટેગરી {1} અથવા કંપનીમાં {0} સેટ કરો {2}
@@ -1536,7 +1543,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","રિઝર્વેટેડ ક્વોટી: વેચવા માટેનો જથ્થો આપ્યો, પરંતુ પહોંચાડ્યો નહીં."
 DocType: Drug Prescription,Interval UOM,અંતરાલ UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","રીસલેક્ટ કરો, જો સાચવેલા સરનામાંને સેવ કર્યા પછી સંપાદિત કરવામાં આવે છે"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,સબકોન્ટ્રેક્ટ માટે અનામત પ્રમાણ: સબકોટ્રેક્ટ વસ્તુઓ બનાવવા માટે કાચા માલનો જથ્થો.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,સબકોન્ટ્રેક્ટ માટે અનામત પ્રમાણ: સબકોટ્રેક્ટ વસ્તુઓ બનાવવા માટે કાચા માલનો જથ્થો.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 DocType: Item,Hub Publishing Details,હબ પબ્લિશિંગ વિગતો
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','શરૂઆત'
@@ -1797,6 +1804,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,આઇટમ્સ અને યુઓએમ આયાત કરી રહ્યું છે
 DocType: Repayment Schedule,Balance Loan Amount,બેલેન્સ લોન રકમ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,વિગતોમાં ઉમેરાઈ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","માફ કરશો, કૂપન કોડ ખતમ થઈ ગયો છે"
 DocType: Communication Medium,Catch All,બધા બો
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,સૂચિ કોર્સ
 DocType: Budget,Applicable on Material Request,ભૌતિક વિનંતી પર લાગુ
@@ -1964,6 +1972,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,ઇમેઇલ ઝુંબેશ
+DocType: Sales Partner,To Track inbound purchase,ઇનબાઉન્ડ ખરીદીને ટ્રેક કરવા
 DocType: Buying Settings,Default Supplier Group,ડિફોલ્ટ સપ્લાયર ગ્રુપ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},ઘટક {0} માટે લાયક મહત્તમ રકમ {1} થી વધી જાય છે
@@ -2116,7 +2125,6 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,સ્ટોક એન્ટ્રી કરો
 DocType: Hotel Room Reservation,Hotel Reservation User,હોટેલ રિઝર્વેશન યુઝર
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,સ્થિતિ સેટ કરો
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Contract,Fulfilment Deadline,સમાપ્તિની છેલ્લી તારીખ
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,તમારી નજીક
@@ -2240,6 +2248,7 @@
 DocType: Quality Meeting Table,Under Review,સમીક્ષા હેઠળ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,લૉગિન કરવામાં નિષ્ફળ
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,સંપત્તિ {0} બનાવી
+DocType: Coupon Code,Promotional,પ્રમોશનલ
 DocType: Special Test Items,Special Test Items,ખાસ ટેસ્ટ આઈટમ્સ
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,તમે બજાર પર રજીસ્ટર કરવા માટે સિસ્ટમ મેનેજર અને આઇટમ મેનેજર ભૂમિકાઓ સાથે વપરાશકર્તા બનવાની જરૂર છે.
 apps/erpnext/erpnext/config/buying.py,Key Reports,કી અહેવાલો
@@ -2277,6 +2286,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,ડૉક પ્રકાર
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
 DocType: Subscription Plan,Billing Interval Count,બિલિંગ અંતરાલ ગણક
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,નિમણૂંકો અને પેશન્ટ એન્કાઉન્ટર
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,મૂલ્ય ખૂટે છે
 DocType: Employee,Department and Grade,વિભાગ અને ગ્રેડ
@@ -2376,6 +2387,7 @@
 DocType: Project,Start and End Dates,શરૂ કરો અને તારીખો અંત
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,કોન્ટ્રેક્ટ ઢાંચો પૂર્તિ શરતો
 ,Delivered Items To Be Billed,વિતરિત વસ્તુઓ બિલ કરવા
+DocType: Coupon Code,Maximum Use,મહત્તમ ઉપયોગ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ઓપન BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,વેરહાઉસ સીરીયલ નંબર માટે બદલી શકાતું નથી
 DocType: Authorization Rule,Average Discount,સરેરાશ ડિસ્કાઉન્ટ
@@ -2535,6 +2547,7 @@
 DocType: Item,Inventory,ઈન્વેન્ટરી
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,જેસન તરીકે ડાઉનલોડ કરો
 DocType: Item,Sales Details,સેલ્સ વિગતો
+DocType: Coupon Code,Used,વપરાયેલ
 DocType: Opportunity,With Items,વસ્તુઓ સાથે
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',ઝુંબેશ &#39;{0}&#39; પહેલાથી જ {1} &#39;{2}&#39; માટે અસ્તિત્વમાં છે
 DocType: Asset Maintenance,Maintenance Team,જાળવણી ટીમ
@@ -2661,7 +2674,7 @@
 						Serial No cannot be ensured",આઇટમ {0} માટે કોઈ સક્રિય BOM મળી નથી. \ Serial No દ્વારા ડિલિવરીની ખાતરી કરી શકાતી નથી
 DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
 DocType: Loan Type,Maximum Loan Amount,મહત્તમ લોન રકમ
-DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
+DocType: Coupon Code,Pricing Rule,પ્રાઇસીંગ નિયમ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},વિદ્યાર્થી માટે ડુપ્લિકેટ રોલ નંબર {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
 DocType: Company,Default Selling Terms,ડિફોલ્ટ વેચવાની શરતો
@@ -2738,6 +2751,7 @@
 DocType: Payment Schedule,Payment Amount,ચુકવણી રકમ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,અર્ધ દિવસની તારીખ કાર્ય તારીખથી અને કાર્ય સમાપ્તિ તારીખ વચ્ચે હોવી જોઈએ
 DocType: Healthcare Settings,Healthcare Service Items,હેલ્થકેર સેવા આઈટમ્સ
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,અમાન્ય બારકોડ. આ બારકોડ સાથે કોઈ આઇટમ જોડાયેલ નથી.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,કમ્પોનન્ટ રકમ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Assessment Plan,Grading Scale,ગ્રેડીંગ સ્કેલ
@@ -2855,7 +2869,6 @@
 DocType: Share Transfer,Asset Account,એસેટ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,નવી પ્રકાશન તારીખ ભવિષ્યમાં હોવી જોઈએ
 DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Lab Test,Technician Name,ટેક્નિશિયન નામ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3128,7 +3141,6 @@
 DocType: Student,Student Mobile Number,વિદ્યાર્થી મોબાઇલ નંબર
 DocType: Item,Has Variants,ચલો છે
 DocType: Employee Benefit Claim,Claim Benefit For,દાવાના લાભ માટે
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} કરતાં વધુ [{1}} પંક્તિમાં આઇટમ {0} માટે વધુપડતું નથી. ઓવર-બિલિંગને મંજૂરી આપવા માટે, કૃપા કરીને સ્ટોક સેટિંગ્સમાં સેટ કરો"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,પ્રતિભાવ અપડેટ કરો
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
@@ -3413,6 +3425,7 @@
 DocType: Vehicle,Fuel Type,ફ્યુઅલ પ્રકાર
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,કંપની ચલણ સ્પષ્ટ કરો
 DocType: Workstation,Wages per hour,કલાક દીઠ વેતન
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,સામગ્રી અરજીઓ નીચેની આઇટમ ફરીથી ક્રમમાં સ્તર પર આધારિત આપોઆપ ઊભા કરવામાં આવ્યા છે
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
@@ -3742,6 +3755,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,પગાર સ્લિપ રજુ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,હોલ્ડ પર
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,ક્યુશનમાં ઓછામાં ઓછા એક સાચા વિકલ્પો હોવા આવશ્યક છે
+apps/erpnext/erpnext/hooks.py,Purchase Orders,ખરીદી ઓર્ડર
 DocType: Account,Inter Company Account,ઇન્ટર કંપની એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,બલ્ક આયાત
 DocType: Sales Partner,Address & Contacts,સરના સંપર્કો
@@ -3752,6 +3766,7 @@
 DocType: POS Profile,[Select],[પસંદ કરો]
 DocType: Staffing Plan Detail,Number Of Positions,સ્થાનોની સંખ્યા
 DocType: Vital Signs,Blood Pressure (diastolic),બ્લડ પ્રેશર (ડાયાસ્ટોલિક)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,કૃપા કરીને ગ્રાહક પસંદ કરો.
 DocType: SMS Log,Sent To,મોકલવામાં
 DocType: Agriculture Task,Holiday Management,હોલીડે મેનેજમેન્ટ
 DocType: Payment Request,Make Sales Invoice,સેલ્સ ભરતિયું બનાવો
@@ -3958,7 +3973,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} અપર્ણ ન કરાય
 DocType: Subscription,Trialling,ટ્રાયલિંગ
 DocType: Sales Invoice Item,Deferred Revenue,વિલંબિત આવક
-DocType: Bank Account,GL Account,જીએલ એકાઉન્ટ
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,કેશ એકાઉન્ટ સેલ્સ ઇન્વૉઇસ બનાવટ માટે ઉપયોગમાં લેવાશે
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,મુક્તિ ઉપ વર્ગ
 DocType: Member,Membership Expiry Date,સભ્યપદ સમાપ્તિ તારીખ
@@ -4355,13 +4369,13 @@
 DocType: C-Form Invoice Detail,Territory,પ્રદેશ
 DocType: Pricing Rule,Apply Rule On Item Code,આઇટમ કોડ પર નિયમ લાગુ કરો
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,સ્ટોક બેલેન્સ રિપોર્ટ
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,ફી
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,સંચયિત રકમ બતાવો
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,અપડેટ પ્રગતિમાં છે તેમાં થોડો સમય લાગી શકે છે
 DocType: Production Plan Item,Produced Qty,ઉત્પાદન જથ્થો
 DocType: Vehicle Log,Fuel Qty,ફ્યુઅલ Qty
-DocType: Stock Entry,Target Warehouse Name,ટાર્ગેટ વેરહાઉસ નામ
 DocType: Work Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
 DocType: Course,Assessment,આકારણી
 DocType: Payment Entry Reference,Allocated,સોંપાયેલ
@@ -4427,10 +4441,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","સ્ટાન્ડર્ડ નિયમો અને વેચાણ અને ખરીદી માટે ઉમેરી શકાય છે કે શરતો. ઉદાહરણો: આ ઓફર 1. માન્યતા. 1. ચુકવણી શરતો (ક્રેડિટ પર અગાઉથી, ભાગ અગાઉથી વગેરે). 1. વધારાની (અથવા ગ્રાહક દ્વારા ચૂકવવાપાત્ર છે) છે. 1. સુરક્ષા / વપરાશ ચેતવણી. 1. વોરંટી કોઈ હોય તો. 1. નીતિ આપે છે. શીપીંગ 1. શરતો લાગુ પડતું હોય તો. વિવાદો સંબોધન, ક્ષતિપૂર્તિ, જવાબદારી 1. રીતો, વગેરે 1. સરનામું અને તમારી કંપની સંપર્ક."
 DocType: Homepage Section,Section Based On,વિભાગ આધારિત પર
+DocType: Shopping Cart Settings,Show Apply Coupon Code,લાગુ કૂપન કોડ બતાવો
 DocType: Issue,Issue Type,ઇશ્યૂ પ્રકાર
 DocType: Attendance,Leave Type,રજા પ્રકાર
 DocType: Purchase Invoice,Supplier Invoice Details,પુરવઠોકર્તા ઇન્વૉઇસ વિગતો
 DocType: Agriculture Task,Ignore holidays,રજાઓ અવગણો
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,કૂપન શરતો ઉમેરો / સંપાદિત કરો
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ખર્ચ / તફાવત એકાઉન્ટ ({0}) એક &#39;નફો અથવા નુકસાન ખાતામાં હોવા જ જોઈએ
 DocType: Stock Entry Detail,Stock Entry Child,સ્ટોક એન્ટ્રી ચાઇલ્ડ
 DocType: Project,Copied From,નકલ
@@ -4601,6 +4617,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,આકારણી યોજના માપદંડ
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,વ્યવહારો
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ખરીદી ઓર્ડર્સ અટકાવો
+DocType: Coupon Code,Coupon Name,કૂપન નામ
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,સંવેદનશીલ
 DocType: Email Campaign,Scheduled,અનુસૂચિત
 DocType: Shift Type,Working Hours Calculation Based On,વર્કિંગ અવર્સ ગણતરી પર આધારિત
@@ -4617,7 +4634,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,ચલો બનાવો
 DocType: Vehicle,Diesel,ડીઝલ
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,ભાવ યાદી કરન્સી પસંદ નહી
+DocType: Quick Stock Balance,Available Quantity,ઉપલબ્ધ જથ્થો
 DocType: Purchase Invoice,Availed ITC Cess,ફાયર્ડ આઇટીસી સેસ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 ,Student Monthly Attendance Sheet,વિદ્યાર્થી માસિક હાજરી શીટ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,શીપીંગ નિયમ ફક્ત વેચાણ માટે લાગુ પડે છે
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,અવમૂલ્યન રો {0}: આગામી અવમૂલ્યન તારીખ ખરીદ તારીખ પહેલાં ન હોઈ શકે
@@ -4685,6 +4704,7 @@
 DocType: Quality Meeting,Quality Meeting,ગુણવત્તા સભા
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,બિન-ગ્રુપ ગ્રુપ
 DocType: Employee,ERPNext User,ERPNext વપરાશકર્તા
+DocType: Coupon Code,Coupon Description,કૂપન વર્ણન
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},બેચ પંક્તિમાં ફરજિયાત છે {0}
 DocType: Company,Default Buying Terms,ડિફોલ્ટ ખરીદવાની શરતો
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ખરીદી રસીદ વસ્તુ પાડેલ
@@ -4846,6 +4866,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,દસ્તાવેજ વિગતવાર સામે કોઈ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},દેશ {0} માટે કાઢી નાંખવાની પરવાનગી નથી
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,પાર્ટી પ્રકાર ફરજિયાત છે
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,કૂપન કોડ લાગુ કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","જોબ કાર્ડ {0} માટે, તમે ફક્ત &#39;મટિરિયલ ટ્રાન્સફર ફોર મેન્યુફેક્ચર&#39; ટાઇપ સ્ટોક એન્ટ્રી કરી શકો છો"
 DocType: Quality Inspection,Outgoing,આઉટગોઇંગ
 DocType: Customer Feedback Table,Customer Feedback Table,ગ્રાહક પ્રતિસાદ કોષ્ટક
@@ -4995,7 +5016,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ઓર્ડર સબમિશન પર ખરીદી
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,બધા સપ્લાયર્સ ઉમેરો
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,રો # {0}: ફાળવેલ રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 DocType: Tally Migration,Parties,પક્ષો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,બ્રાઉઝ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,સુરક્ષીત લોન્સ
@@ -5026,7 +5046,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},આઇટમ {0} માટે વૈકલ્પિક આઇટમ સેટ કરવાની મંજૂરી આપશો નહીં
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,અધિકૃત હસ્તાક્ષર
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),નેટ આઇટીસી ઉપલબ્ધ છે (એ) - (બી)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ફી બનાવો
 DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે)
@@ -5050,6 +5069,7 @@
 DocType: Quiz Result,Wrong,ખોટું
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,દર ભાવ યાદી ચલણ ગ્રાહક આધાર ચલણ ફેરવાય છે
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ચોખ્ખી રકમ (કંપની ચલણ)
+DocType: Sales Partner,Referral Code,રેફરલ કોડ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,કુલ એડવાન્સ રકમ કુલ મંજૂર કરેલી રકમ કરતા વધારે ન હોઈ શકે
 DocType: Salary Slip,Hour Rate,કલાક દર
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Autoટો રી-ઓર્ડરને સક્ષમ કરો
@@ -5177,6 +5197,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},આઇટમ {0} સામે BOM પસંદ કરો
 DocType: Shopping Cart Settings,Show Stock Quantity,સ્ટોક જથ્થો બતાવો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,ઓપરેશન્સ થી ચોખ્ખી રોકડ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {1}) મળ્યું નથી: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,આઇટમ 4
 DocType: Student Admission,Admission End Date,પ્રવેશ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,પેટા કરાર
@@ -5199,6 +5220,7 @@
 DocType: Travel Request,Fully Sponsored,સંપૂર્ણપણે પ્રાયોજિત
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,રિવર્સ જર્નલ એન્ટ્રી
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,જોબ કાર્ડ બનાવો
+DocType: Quotation,Referral Sales Partner,રેફરલ સેલ્સ પાર્ટનર
 DocType: Quality Procedure Process,Process Description,પ્રક્રિયા વર્ણન
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,ગ્રાહક {0} બનાવવામાં આવેલ છે
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,હાલમાં કોઈ વેરહાઉસમાં કોઈ સ્ટોક ઉપલબ્ધ નથી
@@ -5330,6 +5352,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM દર
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,અપલોડ કરેલી ફાઇલ વાંચવી
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ કાર્ય ઓર્ડર રદ કરી શકાતો નથી, તેને રદ કરવા માટે પ્રથમ રદ કરો"
+DocType: Coupon Code,Coupon Code,કુપનનૉ ગુપ્ત્તાન્ક
 DocType: Asset,Journal Entry for Scrap,સ્ક્રેપ માટે જર્નલ પ્રવેશ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,ડ લવર નોંધ વસ્તુઓ ખેંચી કરો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},રો {0}: ઓપરેશન સામે વર્કસ્ટેશન પસંદ કરો {1}
@@ -5409,6 +5432,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;તારીખ&#39; જરૂરી છે
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,માહિતી આયાત અને નિકાસ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","માફ કરશો, કૂપન કોડ માન્યતા સમાપ્ત થઈ ગઈ છે"
 DocType: Bank Account,Account Details,ખાતાની માહિતી
 DocType: Crop,Materials Required,સામગ્રી આવશ્યક છે
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
@@ -5446,6 +5470,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,વપરાશકર્તાઓ પર જાઓ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,ચૂકવેલ રકમ રકમ ગ્રાન્ડ કુલ કરતાં વધારે ન હોઈ શકે માંડવાળ +
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} વસ્તુ માટે માન્ય બેચ નંબર નથી {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,કૃપા કરીને માન્ય કૂપન કોડ દાખલ કરો !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},નોંધ: છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Task,Task Description,કાર્ય વર્ણન
 DocType: Training Event,Seminar,સેમિનાર
@@ -5708,6 +5733,7 @@
 ,TDS Payable Monthly,ટીડીએસ ચૂકવવાપાત્ર માસિક
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,બોમની બદલી માટે કતારબદ્ધ. તેમાં થોડો સમય લાગી શકે છે.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,કુલ ચુકવણીઓ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},શ્રેણીબદ્ધ વસ્તુ માટે સીરીયલ અમે જરૂરી {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
@@ -5795,6 +5821,7 @@
 DocType: Production Plan,Get Raw Materials For Production,ઉત્પાદન માટે કાચો માલ મેળવો
 DocType: Job Opening,Job Title,જોબ શીર્ષક
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,ભાવિ ચુકવણી સંદર્ભ
+DocType: Quotation,Additional Discount and Coupon Code,અતિરિક્ત ડિસ્કાઉન્ટ અને કૂપન કોડ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} સૂચવે છે કે {1} કોઈ અવતરણ પૂરું પાડશે નહીં, પરંતુ બધી વસ્તુઓનો ઉલ્લેખ કરવામાં આવ્યો છે. RFQ ક્વોટ સ્થિતિ સુધારી રહ્યા છીએ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,મહત્તમ નમૂનાઓ - બેચ {1} અને વસ્તુ {2} બેચ {3} માં પહેલાથી જ {0} જાળવી રાખવામાં આવ્યા છે.
@@ -6017,6 +6044,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,વેબસાઇટ હોમપેજ માટે સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} સુધી પકડ છે {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ના સ્કોરકાર્ડ સ્ટેન્ડને કારણે {0} માટે RFQs ને મંજૂરી નથી
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,ખરીદીનું ઇન્વoiceઇસ બનાવો
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,વપરાયેલ પાંદડા
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,શું તમે સામગ્રી વિનંતી સબમિટ કરવા માંગો છો?
 DocType: Job Offer,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
@@ -6031,6 +6059,7 @@
 DocType: Training Event Employee,Optional,વૈકલ્પિક
 DocType: Salary Slip,Earning & Deduction,અર્નિંગ અને કપાત
 DocType: Agriculture Analysis Criteria,Water Analysis,પાણીનું વિશ્લેષણ
+DocType: Sales Order,Skip Delivery Note,ડિલિવરી નોંધ અવગણો
 DocType: Price List,Price Not UOM Dependent,કિંમત યુઓએમ આધારિત નથી
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} ચલો બનાવ્યાં છે
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,ડિફોલ્ટ સેવા સ્તર કરાર પહેલાથી જ અસ્તિત્વમાં છે.
@@ -6234,7 +6263,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,અવમૂલ્યન રો {0}: આગલી અવમૂલ્યન તારીખ ઉપલબ્ધ થવાની તારીખ પહેલાં ન હોઈ શકે
 ,Sales Funnel,વેચાણ નાળચું
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,કાર્ટ
@@ -6328,6 +6356,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",વફાદારીના પોઇંટ્સનો ગણતરી ગણતરીના કારણોના આધારે કરવામાં આવેલા ખર્ચ (સેલ્સ ઇન્વોઇસ દ્વારા) દ્વારા કરવામાં આવશે.
 DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
+DocType: Pricing Rule,Coupon Code Based,કૂપન કોડ આધારિત
 DocType: Company,HRA Settings,એચઆરએ સેટિંગ્સ
 DocType: Homepage,Hero Section,હિરો વિભાગ
 DocType: Employee Transfer,Transfer Date,તારીખ સ્થાનાંતરિત કરો
@@ -6442,6 +6471,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',કૃપા કરીને કંપની ખાલી ફિલ્ટર સેટ જો ગ્રુપ દ્વારા &#39;કંપની&#39; છે
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,પોસ્ટ તારીખ ભવિષ્યના તારીખ ન હોઈ શકે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ROW # {0}: સીરીયલ કોઈ {1} સાથે મેળ ખાતું નથી {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે સંખ્યા ક્રમાંકન સેટ કરો
 DocType: Stock Entry,Target Warehouse Address,ટાર્ગેટ વેરહાઉસ સરનામું
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,પરચુરણ રજા
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"શિફ્ટ પ્રારંભ સમયનો સમય, જે દરમિયાન કર્મચારીની ચકાસણી હાજરી માટે માનવામાં આવે છે."
@@ -6476,7 +6506,6 @@
 DocType: Employee Grade,Employee Grade,કર્મચારીનું ગ્રેડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,છૂટક કામ
 DocType: GSTR 3B Report,June,જૂન
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: Share Balance,From No,ના ના
 DocType: Shift Type,Early Exit Grace Period,પ્રારંભિક એક્ઝિટ ગ્રેસ પીરિયડ
 DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
@@ -6757,7 +6786,6 @@
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {1}) મળ્યું નથી: {2}
 DocType: Journal Entry,Write Off Entry,એન્ટ્રી માંડવાળ
 DocType: BOM,Rate Of Materials Based On,દર સામગ્રી પર આધારિત
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","જો સક્ષમ કરેલું હોય, તો ક્ષેત્ર નોંધણી સાધનમાં ફીલ્ડ એકેડેમિક ટર્મ ફરજિયાત રહેશે."
@@ -6893,6 +6921,7 @@
 DocType: Budget,Warn,ચેતવો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,આ વર્ક ઓર્ડર માટે બધી વસ્તુઓ પહેલેથી જ ટ્રાન્સફર કરવામાં આવી છે.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
+DocType: Bank Account,Company Account,કંપની ખાતું
 DocType: Asset Maintenance,Manufacturing User,ઉત્પાદન વપરાશકર્તા
 DocType: Purchase Invoice,Raw Materials Supplied,કાચો માલ પાડેલ
 DocType: Subscription Plan,Payment Plan,ચુકવણી યોજના
@@ -6934,6 +6963,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) વર્ક ઓર્ડર {3} માં આયોજિત જથ્થા ({2}) કરતા વધુ ન હોઈ શકે
 DocType: Certification Application,Name of Applicant,અરજદારનુંં નામ
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,ઉત્પાદન માટે સમય શીટ.
+DocType: Quick Stock Balance,Quick Stock Balance,ઝડપી સ્ટોક બેલેન્સ
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,પેટાસરવાળો
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,સ્ટોક ટ્રાન્ઝેક્શન પછી વેરિઅન્ટ પ્રોપર્ટીઝ બદલી શકતા નથી. તમારે આ કરવા માટે એક નવી આઇટમ બનાવવી પડશે.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA આદેશ
@@ -7256,6 +7286,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},સેટ કરો {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} નિષ્ક્રિય વિદ્યાર્થી છે
 DocType: Employee,Health Details,આરોગ્ય વિગતો
+DocType: Coupon Code,Coupon Type,કૂપન પ્રકાર
 DocType: Leave Encashment,Encashable days,એન્કેશબલ ટ્રેડીંગ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,ચુકવણી વિનંતી સંદર્ભ દસ્તાવેજ જરૂરી છે બનાવવા માટે
 DocType: Soil Texture,Sandy Clay,રેતાળ માટી
@@ -7534,6 +7565,7 @@
 DocType: Hotel Room Package,Amenities,સવલતો
 DocType: Accounts Settings,Automatically Fetch Payment Terms,આપમેળે ચુકવણીની શરતો મેળવો
 DocType: QuickBooks Migrator,Undeposited Funds Account,અનપેક્ષિત ફંડ્સ એકાઉન્ટ
+DocType: Coupon Code,Uses,ઉપયોગ કરે છે
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,ચુકવણીના બહુવિધ ડિફોલ્ટ મોડને મંજૂરી નથી
 DocType: Sales Invoice,Loyalty Points Redemption,લોયલ્ટી પોઇંટ્સ રીડેમ્પશન
 ,Appointment Analytics,નિમણૂંક ઍનલિટિક્સ
@@ -7550,6 +7582,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,કુલ અંદાજપત્ર
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"ખાલી છોડો છો, તો તમે દર વર્ષે વિદ્યાર્થીઓ ગ્રુપ બનાવી"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","ચકાસાયેલ હોય, તો કુલ નં. દિવસની રજાઓ સમાવેશ થાય છે, અને આ પગાર પ્રતિ દિવસ ની કિંમત ઘટાડશે"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,ડોમેન ઉમેરવામાં નિષ્ફળ
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","રસીદ / વિતરણને મંજૂરી આપવા માટે, સ્ટોક સેટિંગ્સ અથવા આઇટમમાં &quot;ઓવર રસીદ / ડિલિવરી એલાઉન્સ&quot; અપડેટ કરો."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","વર્તમાન કીનો ઉપયોગ કરીને એપ્લિકેશન્સ ઍક્સેસ કરવામાં સમર્થ હશે નહીં, શું તમે ખરેખર છો?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7562,6 +7595,7 @@
 ,BOM Stock Report,BOM સ્ટોક રિપોર્ટ
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","જો ત્યાં કોઈ સોંપાયેલ ટાઇમસ્લોટ નથી, તો પછી આ જૂથ દ્વારા સંચાર સંચાલિત કરવામાં આવશે"
 DocType: Stock Reconciliation Item,Quantity Difference,જથ્થો તફાવત
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: Opportunity Item,Basic Rate,મૂળ દર
 DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
 ,Electronic Invoice Register,ઇલેક્ટ્રોનિક ભરતિયું રજિસ્ટર
@@ -7812,6 +7846,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),કર અને ખર્ચ બાદ (કંપની ચલણ)
 DocType: Item Group,General Settings,સામાન્ય સુયોજનો
 DocType: Article,Article,લેખ
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,કૃપા કરીને કૂપન કોડ દાખલ કરો!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ચલણ અને ચલણ જ ન હોઈ શકે
 DocType: Taxable Salary Slab,Percent Deduction,ટકા કપાત
 DocType: GL Entry,To Rename,નામ બદલવું
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index 48e4709..9dbfea4 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -2111,7 +2111,7 @@
 DocType: Warehouse,Warehouse Detail,פרט מחסן
 DocType: Blanket Order,Order Type,סוג להזמין
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Fiscal Year {0} is required,שנת כספים {0} נדרש
-DocType: Pricing Rule,Pricing Rule,כלל תמחור
+DocType: Coupon Code,Pricing Rule,כלל תמחור
 apps/erpnext/erpnext/controllers/selling_controller.py,To {0} | {1} {2},כדי {0} | {1} {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Set as Lost,קבע כאבוד
 DocType: Student Applicant,Approved,אושר
@@ -3271,6 +3271,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html,Ref,"נ""צ"
 apps/erpnext/erpnext/accounts/utils.py,Please set default {0} in Company {1},אנא קבע את ברירת המחדל {0} ב החברה {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,לבצע את רכישת החשבונית
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Direct Income,הכנסה ישירה
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 7ba9ce6..d745155 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,मेट-डीटी-.YYYY.-
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
 DocType: Shift Type,Enable Auto Attendance,ऑटो अटेंडेंस सक्षम करें
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,कृपया गोदाम और दिनांक दर्ज करें
 DocType: Lost Reason Detail,Opportunity Lost Reason,अवसर खो दिया कारण
 DocType: Patient Appointment,Check availability,उपलब्धता जाँचें
 DocType: Retention Bonus,Bonus Payment Date,बोनस भुगतान दिनांक
@@ -263,6 +264,7 @@
 ,Completed Work Orders,पूर्ण कार्य आदेश
 DocType: Support Settings,Forum Posts,फोरम पोस्ट
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","कार्य को पृष्ठभूमि की नौकरी के रूप में माना गया है। यदि बैकग्राउंड में प्रोसेसिंग पर कोई समस्या है, तो सिस्टम इस स्टॉक रिकंसीलेशन पर त्रुटि के बारे में एक टिप्पणी जोड़ देगा और ड्राफ्ट चरण में वापस आ जाएगा।"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","क्षमा करें, कूपन कोड वैधता शुरू नहीं हुई है"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,कर योग्य राशि
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: Leave Policy,Leave Policy Details,नीति विवरण छोड़ दें
@@ -328,6 +330,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,उपभोज्य
 DocType: Student,B-,बी
 DocType: Assessment Result,Grade,ग्रेड
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Restaurant Table,No of Seats,सीटों की संख्या
 DocType: Sales Invoice,Overdue and Discounted,अतिदेय और रियायती
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,कॉल डिस्कनेक्ट किया गया
@@ -504,6 +507,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,शब्दों में राशि के लिए पंक्ति रिक्ति
 DocType: Vehicle,Additional Details,अतिरिक्त जानकारिया
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,दिया का कोई विवरण नहीं
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,गोदाम से आइटम प्राप्त करें
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,खरीद के लिए अनुरोध.
 DocType: POS Closing Voucher Details,Collected Amount,एकत्रित राशि
 DocType: Lab Test,Submitted Date,सबमिट करने की तिथि
@@ -611,6 +615,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,सीखना
 ,Trial Balance (Simple),परीक्षण शेष (सरल)
 DocType: Purchase Invoice Item,Enable Deferred Expense,डिफरर्ड व्यय सक्षम करें
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,एप्लाइड कूपन कोड
 DocType: Asset,Next Depreciation Date,अगली तिथि मूल्यह्रास
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,कर्मचारी प्रति गतिविधि लागत
 DocType: Accounts Settings,Settings for Accounts,खातों के लिए सेटिंग्स
@@ -846,8 +851,6 @@
 DocType: BOM,Work Order,कार्य आदेश
 DocType: Sales Invoice,Total Qty,कुल मात्रा
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,संरक्षक 2 ईमेल आईडी
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 DocType: Item,Show in Website (Variant),वेबसाइट में दिखाने (variant)
 DocType: Employee,Health Concerns,स्वास्थ्य चिंताएं
 DocType: Payroll Entry,Select Payroll Period,पेरोल की अवधि का चयन करें
@@ -1010,6 +1013,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,कर रोकथाम खाता
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,सभी प्रदायक स्कोरकार्ड
+DocType: Coupon Code,To be used to get discount,छूट पाने के लिए इस्तेमाल किया जाना है
 DocType: Buying Settings,Purchase Receipt Required,खरीद रसीद आवश्यक
 DocType: Sales Invoice,Rail,रेल
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,वास्तविक लागत
@@ -1060,6 +1064,7 @@
 DocType: Production Plan,Production Plan,उत्पादन योजना
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,चालान चालान उपकरण खोलना
 DocType: Salary Component,Round to the Nearest Integer,निकटतम इंटेगर का दौर
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,आइटम को कार्ट में नहीं जोड़ने की अनुमति दें
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,बिक्री लौटें
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,सीरियल नो इनपुट के आधार पर लेनदेन में मात्रा निर्धारित करें
 ,Total Stock Summary,कुल स्टॉक सारांश
@@ -1189,6 +1194,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),बेस घंटे की दर (कंपनी मुद्रा)
 ,Qty To Be Billed,बाइट टू बी बिल
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,वितरित राशि
+DocType: Coupon Code,Gift Card,उपहार पत्र
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,उत्पादन के लिए आरक्षित मात्रा: निर्माण सामग्री बनाने के लिए कच्चे माल की मात्रा।
 DocType: Loyalty Point Entry Redemption,Redemption Date,रीडेम्प्शन तिथि
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,यह बैंक लेन-देन पहले से ही पूरी तरह से मेल खाता है
@@ -1276,6 +1282,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Timesheet बनाएं
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,खरीद चालान
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,यदि केवल 30 दिनों के भीतर आपकी सदस्यता समाप्त होने पर आप केवल नवीनीकृत कर सकते हैं
 DocType: Shopping Cart Settings,Show Stock Availability,स्टॉक उपलब्धता दिखाएं
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},संपत्ति श्रेणी {1} या कंपनी {2} में {0} सेट करें
@@ -1571,7 +1578,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","सुरक्षित मात्रा: मात्रा बिक्री के लिए आदेश दिया है , लेकिन नहीं पहुंचा."
 DocType: Drug Prescription,Interval UOM,अंतराल UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","अचयनित करें, अगर सहेजे जाने के बाद चुना हुआ पता संपादित किया गया है"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,सब-कॉन्ट्रैक्ट के लिए आरक्षित मात्रा: कच्चे माल की मात्रा उप-निर्मित आइटम बनाने के लिए।
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,सब-कॉन्ट्रैक्ट के लिए आरक्षित मात्रा: कच्चे माल की मात्रा उप-निर्मित आइटम बनाने के लिए।
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 DocType: Item,Hub Publishing Details,हब प्रकाशन विवरण
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;उद्घाटन&#39;
@@ -1834,6 +1841,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,आयात आइटम और UOMs
 DocType: Repayment Schedule,Balance Loan Amount,शेष ऋण की राशि
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,विवरण में जोड़ा गया
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","क्षमा करें, कूपन कोड समाप्त हो गए हैं"
 DocType: Communication Medium,Catch All,सबको पकड़ो
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,अनुसूची कोर्स
 DocType: Budget,Applicable on Material Request,सामग्री अनुरोध पर लागू
@@ -2001,6 +2009,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,अमान्य विशेषता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,ईमेल अभियान
+DocType: Sales Partner,To Track inbound purchase,इनबाउंड खरीद को ट्रैक करने के लिए
 DocType: Buying Settings,Default Supplier Group,डिफ़ॉल्ट प्रदायक समूह
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},मात्रा से कम या बराबर होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},घटक {0} के लिए योग्य अधिकतम राशि {1} से अधिक है
@@ -2156,8 +2165,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,स्टॉक एंट्री करें
 DocType: Hotel Room Reservation,Hotel Reservation User,होटल आरक्षण उपयोगकर्ता
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,स्थिति सेट करें
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,पहले उपसर्ग का चयन करें
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 DocType: Contract,Fulfilment Deadline,पूर्ति की अंतिम तिथि
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,तुम्हारे पास
 DocType: Student,O-,हे
@@ -2281,6 +2290,7 @@
 DocType: Quality Meeting Table,Under Review,समीक्षाधीन
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,लॉगिन करने में विफल
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,संपत्ति {0} बनाई गई
+DocType: Coupon Code,Promotional,प्रोमोशनल
 DocType: Special Test Items,Special Test Items,विशेष टेस्ट आइटम
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,बाज़ार प्रबंधक पर पंजीकरण करने के लिए आपको सिस्टम मैनेजर और आइटम मैनेजर भूमिकाओं के साथ एक उपयोगकर्ता होने की आवश्यकता है।
 apps/erpnext/erpnext/config/buying.py,Key Reports,मुख्य रिपोर्ट
@@ -2318,6 +2328,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,डॉक्टर के प्रकार
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
 DocType: Subscription Plan,Billing Interval Count,बिलिंग अंतराल गणना
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,नियुक्तियों और रोगी Encounters
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,मूल्य गुम है
 DocType: Employee,Department and Grade,विभाग और ग्रेड
@@ -2420,6 +2432,7 @@
 DocType: Project,Start and End Dates,आरंभ और अंत तारीखें
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,अनुबंध टेम्पलेट पूर्ति शर्तें
 ,Delivered Items To Be Billed,बिल के लिए दिया आइटम
+DocType: Coupon Code,Maximum Use,अधिकतम उपयोग
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ओपन बीओएम {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,वेयरहाउस सीरियल नंबर के लिए बदला नहीं जा सकता
 DocType: Authorization Rule,Average Discount,औसत छूट
@@ -2582,6 +2595,7 @@
 DocType: Item,Inventory,इनवेंटरी
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Json के रूप में डाउनलोड करें
 DocType: Item,Sales Details,बिक्री विवरण
+DocType: Coupon Code,Used,उपयोग किया गया
 DocType: Opportunity,With Items,आइटम के साथ
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',अभियान &#39;{0}&#39; पहले से ही {1} &#39;{2}&#39; के लिए मौजूद है
 DocType: Asset Maintenance,Maintenance Team,रखरखाव टीम
@@ -2711,7 +2725,7 @@
 						Serial No cannot be ensured",आइटम {0} के लिए कोई सक्रिय बीओएम नहीं मिला। \ Serial No द्वारा डिलीवरी सुनिश्चित नहीं किया जा सकता है
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 DocType: Loan Type,Maximum Loan Amount,अधिकतम ऋण राशि
-DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
+DocType: Coupon Code,Pricing Rule,मूल्य निर्धारण नियम
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},छात्र के लिए डुप्लिकेट रोल नंबर {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 DocType: Company,Default Selling Terms,डिफ़ॉल्ट विक्रय शर्तें
@@ -2790,6 +2804,7 @@
 DocType: Payment Schedule,Payment Amount,भुगतान राशि
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,कार्य दिवस और कार्य समाप्ति तिथि के बीच आधे दिन की तारीख होनी चाहिए
 DocType: Healthcare Settings,Healthcare Service Items,हेल्थकेयर सेवा आइटम
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,अमान्य बारकोड। इस बारकोड से कोई आइटम संलग्न नहीं है।
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Assessment Plan,Grading Scale,ग्रेडिंग पैमाने
@@ -2909,7 +2924,6 @@
 DocType: Share Transfer,Asset Account,संपत्ति खाता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,नई रिलीज की तारीख भविष्य में होनी चाहिए
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Lab Test,Technician Name,तकनीशियन का नाम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3020,6 +3034,7 @@
 DocType: Products Settings,Hide Variants,वेरिएंट छिपाएँ
 DocType: Lead,Next Contact By,द्वारा अगले संपर्क
 DocType: Compensatory Leave Request,Compensatory Leave Request,मुआवजा छुट्टी अनुरोध
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","पंक्ति {1} से अधिक {2} में आइटम {0} के लिए ओवरबिल नहीं कर सकते। ओवर-बिलिंग की अनुमति देने के लिए, कृपया खाता सेटिंग में भत्ता निर्धारित करें"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},आइटम के लिए आवश्यक मात्रा {0} पंक्ति में {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},मात्रा मद के लिए मौजूद वेयरहाउस {0} मिटाया नहीं जा सकता {1}
 DocType: Blanket Order,Order Type,आदेश प्रकार
@@ -3189,7 +3204,6 @@
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
 DocType: Employee Benefit Claim,Claim Benefit For,दावा लाभ के लिए
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} से अधिक पंक्ति {1} में आइटम {0} के लिए अधिकतम नहीं लगाया जा सकता। अधिक-बिलिंग की अनुमति के लिए, कृपया स्टॉक सेटिंग में सेट करें"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,रिस्पांस अपडेट करें
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
@@ -3480,6 +3494,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,कंपनी में मुद्रा निर्दिष्ट करें
 DocType: Workstation,Wages per hour,प्रति घंटे मजदूरी
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},कॉन्फ़िगर करें {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
@@ -3809,6 +3824,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,वेतनपर्ची सबमिट करें
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,होल्ड पर
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,एक qustion में कम से कम एक सही विकल्प होना चाहिए
+apps/erpnext/erpnext/hooks.py,Purchase Orders,क्रय आदेश
 DocType: Account,Inter Company Account,इंटर कंपनी खाता
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,थोक में आयात
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
@@ -3819,6 +3835,7 @@
 DocType: POS Profile,[Select],[ चुनें ]
 DocType: Staffing Plan Detail,Number Of Positions,पदों की संख्या
 DocType: Vital Signs,Blood Pressure (diastolic),रक्तचाप (डायस्टोलिक)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,कृपया ग्राहक चुनें।
 DocType: SMS Log,Sent To,भेजा
 DocType: Agriculture Task,Holiday Management,छुट्टी प्रबंधन
 DocType: Payment Request,Make Sales Invoice,बिक्री चालान बनाएं
@@ -4028,7 +4045,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} प्रस्तुत नहीं किया गया है
 DocType: Subscription,Trialling,trialling
 DocType: Sales Invoice Item,Deferred Revenue,आस्थगित राजस्व
-DocType: Bank Account,GL Account,जीएल खाता
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,बिक्री चालान निर्माण के लिए नकद खाता का उपयोग किया जाएगा
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,छूट उप श्रेणी
 DocType: Member,Membership Expiry Date,सदस्यता समाप्ति तिथि
@@ -4452,13 +4468,13 @@
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
 DocType: Pricing Rule,Apply Rule On Item Code,आइटम कोड पर नियम लागू करें
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,स्टॉक बैलेंस रिपोर्ट
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,शुल्क
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,संचयी राशि दिखाएं
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,अपडेट जारी है। इसमें समय लग सकता है।
 DocType: Production Plan Item,Produced Qty,उत्पादित मात्रा
 DocType: Vehicle Log,Fuel Qty,ईंधन मात्रा
-DocType: Stock Entry,Target Warehouse Name,लक्षित गोदाम का नाम
 DocType: Work Order Operation,Planned Start Time,नियोजित प्रारंभ समय
 DocType: Course,Assessment,मूल्यांकन
 DocType: Payment Entry Reference,Allocated,आवंटित
@@ -4536,10 +4552,12 @@
  1। आदि को संबोधित विवाद, क्षतिपूर्ति, दायित्व, 
  1 के तरीके। पता और अपनी कंपनी के संपर्क।"
 DocType: Homepage Section,Section Based On,अनुभाग के आधार पर
+DocType: Shopping Cart Settings,Show Apply Coupon Code,कूपन कोड लागू करें दिखाएं
 DocType: Issue,Issue Type,समस्या का प्रकार
 DocType: Attendance,Leave Type,प्रकार छोड़ दो
 DocType: Purchase Invoice,Supplier Invoice Details,प्रदायक चालान विवरण
 DocType: Agriculture Task,Ignore holidays,छुट्टियों पर ध्यान न दें
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,कूपन स्थितियां जोड़ें / संपादित करें
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,व्यय / अंतर खाते ({0}) एक 'लाभ या हानि' खाता होना चाहिए
 DocType: Stock Entry Detail,Stock Entry Child,स्टॉक एंट्री चाइल्ड
 DocType: Project,Copied From,से प्रतिलिपि बनाई गई
@@ -4714,6 +4732,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,आकलन योजना मानदंड
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,लेन-देन
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,खरीद ऑर्डर रोकें
+DocType: Coupon Code,Coupon Name,कूपन का नाम
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,ग्रहणक्षम
 DocType: Email Campaign,Scheduled,अनुसूचित
 DocType: Shift Type,Working Hours Calculation Based On,कार्य के घंटे की गणना के आधार पर
@@ -4730,7 +4749,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,वेरिएंट बनाएँ
 DocType: Vehicle,Diesel,डीज़ल
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,मूल्य सूची मुद्रा का चयन नहीं
+DocType: Quick Stock Balance,Available Quantity,उपलब्ध मात्रा
 DocType: Purchase Invoice,Availed ITC Cess,लाभ हुआ आईटीसी सेस
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 ,Student Monthly Attendance Sheet,छात्र मासिक उपस्थिति पत्रक
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,नौवहन नियम केवल बेचना के लिए लागू है
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि खरीद तिथि से पहले नहीं हो सकती है
@@ -4797,8 +4818,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 DocType: Quality Meeting,Quality Meeting,गुणवत्ता की बैठक
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,गैर-समूह समूह को
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 DocType: Employee,ERPNext User,ERPNext उपयोगकर्ता
+DocType: Coupon Code,Coupon Description,कूपन विवरण
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},पंक्ति {0} में बैच अनिवार्य है
 DocType: Company,Default Buying Terms,डिफ़ॉल्ट खरीदना शर्तें
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,खरीद रसीद आइटम की आपूर्ति
@@ -4961,6 +4982,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,दस्तावेज़ विस्तार नहीं के खिलाफ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},देश के लिए विलोपन की अनुमति नहीं है {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,पार्टी प्रकार अनिवार्य है
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,कूपन कोड लागू करें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","जॉब कार्ड {0} के लिए, आप केवल &#39;मैटीरियल ट्रांसफर फॉर मैन्युफैक्चर&#39; टाइप स्टॉक एंट्री कर सकते हैं"
 DocType: Quality Inspection,Outgoing,बाहर जाने वाला
 DocType: Customer Feedback Table,Customer Feedback Table,ग्राहक प्रतिक्रिया तालिका
@@ -5110,7 +5132,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,खरीद आदेश प्रस्तुत करने पर
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,सभी आपूर्तिकर्ता जोड़ें
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ति # {0}: आवंटित राशि बकाया राशि से अधिक नहीं हो सकती।
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Tally Migration,Parties,दलों
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,सुरक्षित कर्जे
@@ -5142,7 +5163,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},आइटम {0} के लिए वैकल्पिक आइटम सेट करने की अनुमति नहीं है
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),नेट आईटीसी उपलब्ध (ए) - (बी)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,फीस बनाएं
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
@@ -5167,6 +5187,7 @@
 DocType: Quiz Result,Wrong,गलत
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर जिस पर मूल्य सूची मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
+DocType: Sales Partner,Referral Code,रेफरल कोड
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,कुल अग्रिम राशि कुल स्वीकृत राशि से अधिक नहीं हो सकती
 DocType: Salary Slip,Hour Rate,घंटा दर
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,ऑटो री-ऑर्डर सक्षम करें
@@ -5295,6 +5316,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,स्टॉक मात्रा दिखाएं
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,संचालन से नेट नकद
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},पंक्ति # {0}: चालान छूट {2} के लिए स्थिति {1} होनी चाहिए
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {1}) आइटम के लिए नहीं मिला: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,आइटम 4
 DocType: Student Admission,Admission End Date,एडमिशन समाप्ति तिथि
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,उप ठेका
@@ -5317,6 +5339,7 @@
 DocType: Travel Request,Fully Sponsored,पूरी तरह से प्रायोजित
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,रिवर्स जर्नल एंट्री
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,जॉब कार्ड बनाएं
+DocType: Quotation,Referral Sales Partner,रेफरल सेल्स पार्टनर
 DocType: Quality Procedure Process,Process Description,प्रक्रिया वर्णन
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,ग्राहक {0} बनाया गया है
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,वर्तमान में किसी भी गोदाम में कोई स्टॉक उपलब्ध नहीं है
@@ -5451,6 +5474,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,बीओएम दर
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,अपलोड की गई फ़ाइल पढ़ना
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","रुक गए कार्य आदेश को रद्द नहीं किया जा सकता, रद्द करने के लिए इसे पहले से हटा दें"
+DocType: Coupon Code,Coupon Code,कूपन कोड
 DocType: Asset,Journal Entry for Scrap,स्क्रैप के लिए जर्नल प्रविष्टि
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,डिलिवरी नोट से आइटम खींच कृपया
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},पंक्ति {0}: ऑपरेशन के खिलाफ वर्कस्टेशन का चयन करें {1}
@@ -5533,6 +5557,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;दिनांक&#39; की आवश्यकता है
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,डाटा आयात और निर्यात
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","क्षमा करें, कूपन कोड वैधता समाप्त हो गई है"
 DocType: Bank Account,Account Details,खाता विवरण
 DocType: Crop,Materials Required,सामग्री की आवश्यकता
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,कोई छात्र नहीं मिले
@@ -5570,6 +5595,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,उपयोगकर्ता पर जाएं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,भुगतान की गई राशि + राशि से लिखने के कुल योग से बड़ा नहीं हो सकता
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} आइटम के लिए एक वैध बैच नंबर नहीं है {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,कृपया मान्य कूपन कोड दर्ज करें !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},नोट : छोड़ किस्म के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Task,Task Description,कार्य विवरण
 DocType: Training Event,Seminar,सेमिनार
@@ -5833,6 +5859,7 @@
 ,TDS Payable Monthly,टीडीएस मासिक देय
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,बीओएम की जगह के लिए कतारबद्ध इसमें कुछ मिनट लग सकते हैं।
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,कुल भुगतान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},श्रृंखलाबद्ध मद के लिए सीरियल नं आवश्यक {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,चालान के साथ मैच भुगतान
@@ -5922,6 +5949,7 @@
 DocType: Production Plan,Get Raw Materials For Production,कच्चे माल के लिए उत्पादन प्राप्त करें
 DocType: Job Opening,Job Title,कार्य शीर्षक
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,भविष्य का भुगतान रेफरी
+DocType: Quotation,Additional Discount and Coupon Code,अतिरिक्त छूट और कूपन कोड
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} इंगित करता है कि {1} कोई उद्धरण नहीं प्रदान करेगा, लेकिन सभी वस्तुओं को उद्धृत किया गया है। आरएफक्यू कोटेशन स्थिति को अद्यतन करना"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,अधिकतम नमूनों - {0} बैच {1} और वस्तु {2} बैच {3} में पहले से ही बनाए गए हैं
@@ -6148,7 +6176,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,वेबसाइट मुखपृष्ठ के लिए सेटिंग
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} {1} तक पकड़ पर है
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} के स्कोरकार्ड स्टैंड के कारण आरएफक्यू को {0} के लिए अनुमति नहीं है
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,खरीद चालान बनाएं
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,प्रयुक्त पत्तियां
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} कूपन का उपयोग किया जाता है {1}। अनुमति मात्रा समाप्त हो गई है
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,क्या आप सामग्री अनुरोध सबमिट करना चाहते हैं
 DocType: Job Offer,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6162,6 +6192,7 @@
 DocType: Training Event Employee,Optional,ऐच्छिक
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 DocType: Agriculture Analysis Criteria,Water Analysis,जल विश्लेषण
+DocType: Sales Order,Skip Delivery Note,वितरण नोट छोड़ें
 DocType: Price List,Price Not UOM Dependent,मूल्य नहीं UOM आश्रित
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} बनाए गए संस्करण।
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,एक डिफ़ॉल्ट सेवा स्तर समझौता पहले से मौजूद है।
@@ -6266,6 +6297,7 @@
 DocType: Vehicle,Last Carbon Check,अंतिम कार्बन चेक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,विधि व्यय
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,कृपया पंक्ति पर मात्रा का चयन करें
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},वर्क ऑर्डर {0}: ऑपरेशन के लिए जॉब कार्ड नहीं मिला {1}
 DocType: Purchase Invoice,Posting Time,बार पोस्टिंग
 DocType: Timesheet,% Amount Billed,% बिल की राशि
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,टेलीफोन व्यय
@@ -6368,7 +6400,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि उपलब्ध उपयोग के लिए पहले नहीं हो सकती है
 ,Sales Funnel,बिक्री कीप
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,गाड़ी
@@ -6464,6 +6495,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",वफादारी अंक का उल्लेख संग्रहित कारक के आधार पर किए गए व्यय (बिक्री चालान के माध्यम से) से किया जाएगा।
 DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
+DocType: Pricing Rule,Coupon Code Based,कूपन कोड आधारित
 DocType: Company,HRA Settings,एचआरए सेटिंग्स
 DocType: Homepage,Hero Section,हीरो सेक्शन
 DocType: Employee Transfer,Transfer Date,हस्तांतरण की तारीख
@@ -6579,6 +6611,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',अगर ग्रुप बाय &#39;कंपनी&#39; है तो कंपनी को फिल्टर रिक्त करें
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,पोस्ट दिनांक भविष्य की तारीख नहीं किया जा सकता
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},पंक्ति # {0}: सीरियल नहीं {1} के साथ मेल नहीं खाता {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 DocType: Stock Entry,Target Warehouse Address,लक्ष्य वेअरहाउस पता
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,आकस्मिक छुट्टी
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,पारी शुरू होने से पहले का समय जिसके दौरान कर्मचारी चेक-इन उपस्थिति के लिए माना जाता है।
@@ -6613,7 +6646,6 @@
 DocType: Employee Grade,Employee Grade,कर्मचारी ग्रेड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ठेका
 DocType: GSTR 3B Report,June,जून
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 DocType: Share Balance,From No,नंबर से
 DocType: Shift Type,Early Exit Grace Period,प्रारंभिक निकास अनुग्रह अवधि
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
@@ -6898,7 +6930,6 @@
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,रोल अनुमोदन या उपयोगकर्ता स्वीकृति दर्ज करें
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {1}) आइटम के लिए नहीं मिला: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,एंटिटी टाइप {0} और एंटिटी {1} सर्विस लेवल एग्रीमेंट पहले से मौजूद है।
 DocType: Journal Entry,Write Off Entry,एंट्री बंद लिखने
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
@@ -7036,6 +7067,7 @@
 DocType: Budget,Warn,चेतावनी देना
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,इस कार्य आदेश के लिए सभी आइटम पहले ही स्थानांतरित कर दिए गए हैं।
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
+DocType: Bank Account,Company Account,कंपनी खाता
 DocType: Asset Maintenance,Manufacturing User,विनिर्माण प्रयोक्ता
 DocType: Purchase Invoice,Raw Materials Supplied,कच्चे माल की आपूर्ति
 DocType: Subscription Plan,Payment Plan,भुगतान योजना
@@ -7077,6 +7109,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) वर्क ऑर्डर में नियोजित मात्रा ({2}) से अधिक नहीं हो सकता है {3}
 DocType: Certification Application,Name of Applicant,आवेदक का नाम
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,विनिर्माण के लिए समय पत्रक।
+DocType: Quick Stock Balance,Quick Stock Balance,क्विक स्टॉक बैलेंस
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,आधा
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,स्टॉक लेनदेन के बाद वेरिएंट गुणों को बदल नहीं सकते हैं। ऐसा करने के लिए आपको एक नया आइटम बनाना होगा।
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA आदेश
@@ -7402,6 +7435,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},सेट करें {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} निष्क्रिय छात्र है
 DocType: Employee,Health Details,स्वास्थ्य विवरण
+DocType: Coupon Code,Coupon Type,कूपन प्रकार
 DocType: Leave Encashment,Encashable days,Encashable दिन
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,भुगतान अनुरोध संदर्भ दस्तावेज़ बनाने के लिए आवश्यक है
 DocType: Soil Texture,Sandy Clay,सैंडी क्ले
@@ -7685,6 +7719,7 @@
 DocType: Hotel Room Package,Amenities,आराम
 DocType: Accounts Settings,Automatically Fetch Payment Terms,स्वचालित रूप से भुगतान शर्तें प्राप्त करें
 DocType: QuickBooks Migrator,Undeposited Funds Account,Undeposited फंड खाता
+DocType: Coupon Code,Uses,उपयोग
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,भुगतान के कई डिफ़ॉल्ट मोड की अनुमति नहीं है
 DocType: Sales Invoice,Loyalty Points Redemption,वफादारी अंक मोचन
 ,Appointment Analytics,नियुक्ति विश्लेषिकी
@@ -7701,6 +7736,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,कुल बजट
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,अगर आप प्रति वर्ष छात्र समूह बनाते हैं तो रिक्त छोड़ दें
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","जाँच की, तो कुल नहीं. कार्य दिवस की छुट्टियों में शामिल होगा, और यह प्रति दिन वेतन का मूल्य कम हो जाएगा"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,डोमेन जोड़ने में विफल
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","रसीद / वितरण की अनुमति देने के लिए, स्टॉक सेटिंग्स या आइटम में &quot;ओवर रसीद / वितरण भत्ता&quot; अपडेट करें।"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","वर्तमान कुंजी का उपयोग करने वाले ऐप्स तक पहुंचने में सक्षम नहीं होंगे, क्या आप निश्चित हैं?"
 DocType: Subscription Settings,Prorate,prorate
@@ -7713,6 +7749,7 @@
 ,BOM Stock Report,बीओएम स्टॉक रिपोर्ट
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","यदि कोई निर्धारित समयसीमा नहीं है, तो संचार इस समूह द्वारा नियंत्रित किया जाएगा"
 DocType: Stock Reconciliation Item,Quantity Difference,मात्रा अंतर
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 ,Electronic Invoice Register,इलेक्ट्रॉनिक चालान रजिस्टर
@@ -7966,6 +8003,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),कर और शुल्क कटौती (कंपनी मुद्रा)
 DocType: Item Group,General Settings,सामान्य सेटिंग्स
 DocType: Article,Article,लेख
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,कृपया कूपन कोड दर्ज करें !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,मुद्रा से और मुद्रा ही नहीं किया जा सकता है
 DocType: Taxable Salary Slab,Percent Deduction,प्रतिशत कटौती
 DocType: GL Entry,To Rename,का नाम बदला
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index f590e18..1e9d77a 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kupac Kontakt
 DocType: Shift Type,Enable Auto Attendance,Omogući automatsku posjetu
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Unesite datum skladišta i datum
 DocType: Lost Reason Detail,Opportunity Lost Reason,Prilika izgubljen razlog
 DocType: Patient Appointment,Check availability,Provjera dostupnosti
 DocType: Retention Bonus,Bonus Payment Date,Datum plaćanja bonusa
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Dovršeni radni nalozi
 DocType: Support Settings,Forum Posts,Forum postova
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Zadatak je zamišljen kao pozadinski posao. U slučaju da dođe do problema s obradom u pozadini, sustav će dodati komentar o pogrešci ovog usklađivanja zaliha i vratit će se u fazu skice."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Nažalost, valjanost koda kupona nije započela"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Iznos oporezivanja
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: Leave Policy,Leave Policy Details,Ostavite pojedinosti o pravilima
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,potrošni
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Razred
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Restaurant Table,No of Seats,Nema sjedala
 DocType: Sales Invoice,Overdue and Discounted,Prepušteni i popusti
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Poziv prekinuti
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Prored za iznos u riječima
 DocType: Vehicle,Additional Details,dodatni detalji
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Nema opisa
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Dohvaćanje predmeta iz skladišta
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Zahtjev za kupnju.
 DocType: POS Closing Voucher Details,Collected Amount,Prikupljeni iznos
 DocType: Lab Test,Submitted Date,Poslani datum
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Naučiti
 ,Trial Balance (Simple),Probna ravnoteža (jednostavno)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Omogući odgođeno plaćanje
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Primijenjeni kod kupona
 DocType: Asset,Next Depreciation Date,Sljedeći datum Amortizacija
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Aktivnost Cijena po zaposlenom
 DocType: Accounts Settings,Settings for Accounts,Postavke za račune
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Radni nalog
 DocType: Sales Invoice,Total Qty,Ukupna količina
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-pošte Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Item,Show in Website (Variant),Prikaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Payroll Entry,Select Payroll Period,Odaberite Platne razdoblje
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Račun za zadržavanje poreza
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Sve ocjene bodova dobavljača.
+DocType: Coupon Code,To be used to get discount,Da se iskoristi za popust
 DocType: Buying Settings,Purchase Receipt Required,Primka je obvezna
 DocType: Sales Invoice,Rail,željeznički
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Stvarna cijena
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Plan proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvaranje alata za izradu računa
 DocType: Salary Component,Round to the Nearest Integer,Zaokružite na najbliži cijeli broj
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Dopustite dodavanje predmeta u košaricu za kupnju
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Povrat robe
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Postavite količinu u transakcijama na temelju serijskog unosa
 ,Total Stock Summary,Ukupni zbroj dionica
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Baza Sat stopa (Društvo valuta)
 ,Qty To Be Billed,Količina za naplatu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Isporučeno Iznos
+DocType: Coupon Code,Gift Card,Poklon kartica
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Količina rezervirane za proizvodnju: Količina sirovina za izradu proizvodnih predmeta.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum otkupa
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Ova je bankovna transakcija već u potpunosti usklađena
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Napravite časopis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Račun {0} unesen više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Kupnja fakture
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Možete obnoviti pretplatu samo ako vaše članstvo istekne u roku od 30 dana
 DocType: Shopping Cart Settings,Show Stock Availability,Prikaži raspoloživa roba
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Postavite {0} u kategoriji imovine {1} ili tvrtku {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervirano Količina : Količina naručiti za prodaju , ali nije dostavljena ."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",Ponovno odaberite ako je odabrana adresa uređena nakon spremanja
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Količina rezerviranog za podugovor: Količina sirovina za izradu poduhvata.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Količina rezerviranog za podugovor: Količina sirovina za izradu poduhvata.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 DocType: Item,Hub Publishing Details,Pojedinosti objavljivanja središta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&quot;Otvaranje &#39;
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Uvoz predmeta i UOM-ova
 DocType: Repayment Schedule,Balance Loan Amount,Stanje Iznos kredita
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Dodano detaljima
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Nažalost, kod kupona je iscrpljen"
 DocType: Communication Medium,Catch All,Uhvatiti sve
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Raspored nastave
 DocType: Budget,Applicable on Material Request,Primjenjivo na zahtjev za materijal
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Pogrešna Osobina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Kampanje e-pošte
+DocType: Sales Partner,To Track inbound purchase,Kako biste pratili ulaznu kupnju
 DocType: Buying Settings,Default Supplier Group,Zadana skupina dobavljača
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Maksimalni iznos koji ispunjava uvjete za komponentu {0} prelazi {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Unesite zalihe
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik hotela rezervacije
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Postavite status
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijsku brojevnu seriju za Attendance putem Postavljanje&gt; Numeriranje serija
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Odaberite prefiks prvi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; Imenovanje serija
 DocType: Contract,Fulfilment Deadline,Rok provedbe
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Blizu tebe
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,U pregledu
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Prijava nije uspjela
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Izrađen je element {0}
+DocType: Coupon Code,Promotional,reklamni
 DocType: Special Test Items,Special Test Items,Posebne ispitne stavke
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Morate biti korisnik s ulogama upravitelja sustava i upravitelja stavki da biste se registrirali na tržištu.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Ključna izvješća
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc tip
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
 DocType: Subscription Plan,Billing Interval Count,Brojač intervala naplate
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Imenovanja i susreta pacijenata
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Nedostaje vrijednost
 DocType: Employee,Department and Grade,Odjel i ocjena
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Datumi početka i završetka
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Uvjeti ispunjenja predloška ugovora
 ,Delivered Items To Be Billed,Isporučeni proizvodi za naplatiti
+DocType: Coupon Code,Maximum Use,Maksimalna upotreba
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Otvoreno BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Skladište se ne može promijeniti za serijskog broja
 DocType: Authorization Rule,Average Discount,Prosječni popust
@@ -2585,6 +2598,7 @@
 DocType: Item,Inventory,Inventar
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Preuzmi kao Json
 DocType: Item,Sales Details,Prodajni detalji
+DocType: Coupon Code,Used,koristi
 DocType: Opportunity,With Items,S Stavke
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampanja &quot;{0}&quot; već postoji za {1} &quot;{2}&quot;
 DocType: Asset Maintenance,Maintenance Team,Tim za održavanje
@@ -2714,7 +2728,7 @@
 						Serial No cannot be ensured",Nije pronađena aktivna BOM za stavku {0}. Dostava po \ Serial No ne može se osigurati
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
-DocType: Pricing Rule,Pricing Rule,Pravila cijena
+DocType: Coupon Code,Pricing Rule,Pravila cijena
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplikat broja valjaka za učenika {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 DocType: Company,Default Selling Terms,Zadani uvjeti prodaje
@@ -2793,6 +2807,7 @@
 DocType: Payment Schedule,Payment Amount,Iznos za plaćanje
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Poludnevni datum bi trebao biti između rada od datuma i datuma završetka radnog vremena
 DocType: Healthcare Settings,Healthcare Service Items,Zdravstvene usluge
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Nevažeći barkod. Nijedna stavka nije priložena ovom barkodu.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,ljestvici
@@ -2912,7 +2927,6 @@
 DocType: Share Transfer,Asset Account,Asset Account
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Novi datum izlaska trebao bi biti u budućnosti
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; HR postavke
 DocType: Lab Test,Technician Name,Naziv tehničara
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3023,6 +3037,7 @@
 DocType: Products Settings,Hide Variants,Sakrij varijante
 DocType: Lead,Next Contact By,Sljedeći kontakt od
 DocType: Compensatory Leave Request,Compensatory Leave Request,Zahtjev za kompenzacijski dopust
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Nije moguće preplatiti za stavku {0} u retku {1} više od {2}. Da biste omogućili prekomjerno naplaćivanje, molimo postavite dodatak u Postavkama računa"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Količina potrebna za proizvod {0} u redku {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Skladište {0} ne može biti izbrisano ako na njemu ima proizvod {1}
 DocType: Blanket Order,Order Type,Vrsta narudžbe
@@ -3191,7 +3206,6 @@
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
 DocType: Employee Benefit Claim,Claim Benefit For,Zatražite korist od
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ne može se overbill za stavku {0} u retku {1} više od {2}. Da biste dopustili prekoračenje, postavite Postavke zaliha"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Ažurirajte odgovor
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3482,6 +3496,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Navedite valutu u Društvu
 DocType: Workstation,Wages per hour,Satnice
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurirajte {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock ravnoteža u batch {0} postat negativna {1} za točku {2} na skladištu {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Sljedeći materijal Zahtjevi su automatski podigli na temelju stavke razini ponovno narudžbi
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
@@ -3811,6 +3826,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Slanje plaće Slip
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Na čekanju
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Q qurance mora imati barem jednu ispravnu mogućnost
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Narudžbenice
 DocType: Account,Inter Company Account,Inter račun tvrtke
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Uvoz u rasutom stanju
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
@@ -3821,6 +3837,7 @@
 DocType: POS Profile,[Select],[Odaberi]
 DocType: Staffing Plan Detail,Number Of Positions,Broj mjesta
 DocType: Vital Signs,Blood Pressure (diastolic),Krvni tlak (dijastolički)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Odaberite kupca.
 DocType: SMS Log,Sent To,Poslano Da
 DocType: Agriculture Task,Holiday Management,Upravljanje odmorom
 DocType: Payment Request,Make Sales Invoice,Napravi prodajni račun
@@ -4029,7 +4046,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} nije podnesen
 DocType: Subscription,Trialling,trialling
 DocType: Sales Invoice Item,Deferred Revenue,Odgođeni prihod
-DocType: Bank Account,GL Account,GL račun
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Račun novca upotrebljavat će se za izradu fakture prodaje
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Podkategorija izuzeća
 DocType: Member,Membership Expiry Date,Datum isteka članstva
@@ -4453,13 +4469,13 @@
 DocType: C-Form Invoice Detail,Territory,Teritorij
 DocType: Pricing Rule,Apply Rule On Item Code,Primijenite pravilo na kod predmeta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Izvještaj o stanju dionica
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Pristojba
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Prikaži kumulativni iznos
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ažuriranje je u tijeku. Može potrajati neko vrijeme.
 DocType: Production Plan Item,Produced Qty,Proizvedena količina
 DocType: Vehicle Log,Fuel Qty,Gorivo Kol
-DocType: Stock Entry,Target Warehouse Name,Naziv ciljnog skladišta
 DocType: Work Order Operation,Planned Start Time,Planirani početak vremena
 DocType: Course,Assessment,procjena
 DocType: Payment Entry Reference,Allocated,Dodijeljeni
@@ -4537,10 +4553,12 @@
  1. Načini adresiranja sporova, naknade štete, odgovornosti, itd 
  1. Kontakt Vaše tvrtke."
 DocType: Homepage Section,Section Based On,Odjeljak na temelju
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Prikaži Primijeni kod kupona
 DocType: Issue,Issue Type,Vrsta izdanja
 DocType: Attendance,Leave Type,Vrsta odsustva
 DocType: Purchase Invoice,Supplier Invoice Details,Dobavljač Detalji Račun
 DocType: Agriculture Task,Ignore holidays,Zanemari blagdane
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Dodavanje / uređivanje uvjeta kupona
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Rashodi / Razlika računa ({0}) mora biti račun 'dobit ili gubitak'
 DocType: Stock Entry Detail,Stock Entry Child,Dijete za ulazak na zalihe
 DocType: Project,Copied From,Kopiran iz
@@ -4715,6 +4733,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Plan Procjena Kriteriji
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transakcije
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Spriječiti narudžbenice
+DocType: Coupon Code,Coupon Name,Naziv kupona
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Osjetljiv
 DocType: Email Campaign,Scheduled,Planiran
 DocType: Shift Type,Working Hours Calculation Based On,Proračun radnog vremena na temelju
@@ -4731,7 +4750,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Napravite Varijante
 DocType: Vehicle,Diesel,Dizel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Valuta cjenika nije odabrana
+DocType: Quick Stock Balance,Available Quantity,Dostupna količina
 DocType: Purchase Invoice,Availed ITC Cess,Availed ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 ,Student Monthly Attendance Sheet,Studentski mjesečna posjećenost list
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Pravilo o isporuci primjenjuje se samo za prodaju
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma kupnje
@@ -4798,8 +4819,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
 DocType: Quality Meeting,Quality Meeting,Sastanak kvalitete
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-skupine do skupine
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; Imenovanje serija
 DocType: Employee,ERPNext User,ERPNext korisnik
+DocType: Coupon Code,Coupon Description,Opis kupona
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Šarža je obavezna u retku {0}
 DocType: Company,Default Buying Terms,Zadani uvjeti kupnje
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Zaprimljena stavka iz primke
@@ -4962,6 +4983,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Brisanje nije dopušteno za zemlju {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Tip stranka je obvezna
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Primijenite kod kupona
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Za radnu karticu {0} možete izvršiti samo unos vrste zaliha &quot;Prijenos materijala za proizvodnju&quot;
 DocType: Quality Inspection,Outgoing,Odlazni
 DocType: Customer Feedback Table,Customer Feedback Table,Tablica s povratnim informacijama kupaca
@@ -5111,7 +5133,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Nakon predaje narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodaj sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Red # {0}: dodijeljeni iznos ne može biti veći od nepodmirenog iznosa.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Tally Migration,Parties,Strane
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,osigurani krediti
@@ -5143,7 +5164,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne dopusti postavljanje alternativne stavke za stavku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ovlašteni potpisnik
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Neto dostupan ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Napravite naknade
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
@@ -5168,6 +5188,7 @@
 DocType: Quiz Result,Wrong,pogrešno
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Stopa po kojoj Cjenik valute se pretvaraju u kupca osnovne valute
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Neto iznos (Društvo valuta)
+DocType: Sales Partner,Referral Code,referentni kod
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Ukupni iznos predujma ne može biti veći od ukupnog sankcioniranog iznosa
 DocType: Salary Slip,Hour Rate,Cijena sata
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Omogući automatsku ponovnu narudžbu
@@ -5296,6 +5317,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Prikaži količinu proizvoda
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Neto novčani tijek iz operacije
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Redak # {0}: Status mora biti {1} za popust fakture {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Stavka 4
 DocType: Student Admission,Admission End Date,Prijem Datum završetka
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Podugovaranje
@@ -5318,6 +5340,7 @@
 DocType: Travel Request,Fully Sponsored,Potpuno sponzoriran
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Obrnuti unos dnevnika
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Izradite Job Card
+DocType: Quotation,Referral Sales Partner,Preporuka prodajni partner
 DocType: Quality Procedure Process,Process Description,Opis procesa
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Korisnik {0} je stvoren.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Trenutno nema raspoloživih količina u bilo kojem skladištu
@@ -5452,6 +5475,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM stopa
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Čitanje prenesene datoteke
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Zaustavljen radni nalog ne može se otkazati, prvo ga otkazati"
+DocType: Coupon Code,Coupon Code,Kupon kod
 DocType: Asset,Journal Entry for Scrap,Temeljnica za otpad
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Molimo povucite stavke iz Dostavnica
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Red {0}: odaberite radnu stanicu protiv operacije {1}
@@ -5534,6 +5558,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,Obavezan je datum
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Uvoz i izvoz podataka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Nažalost, valjanost koda kupona je istekla"
 DocType: Bank Account,Account Details,Detalji računa
 DocType: Crop,Materials Required,Potrebni materijali
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Nema učenika Pronađeno
@@ -5571,6 +5596,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Idite na korisnike
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Uplaćeni iznos + otpis iznos ne može biti veći od SVEUKUPNO
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} nije ispravan broj serije za točku {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Unesite važeći kod kupona !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Napomena : Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Task,Task Description,Opis zadatka
 DocType: Training Event,Seminar,Seminar
@@ -5834,6 +5860,7 @@
 ,TDS Payable Monthly,TDS se plaća mjesečno
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,U redu čekanja za zamjenu BOM-a. Može potrajati nekoliko minuta.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; HR postavke
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Ukupna plaćanja
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serijski Nos potrebna za serijaliziranom točke {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Match Plaćanja s faktura
@@ -5923,6 +5950,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Dobiti sirovine za proizvodnju
 DocType: Job Opening,Job Title,Titula
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Buduće plaćanje Ref
+DocType: Quotation,Additional Discount and Coupon Code,Dodatni popust i kod kupona
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} označava da {1} neće ponuditi ponudu, ali su citirane sve stavke \. Ažuriranje statusa licitacije."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maksimalni uzorci - {0} već su zadržani za šaržu {1} i stavku {2} u seriji {3}.
@@ -6150,7 +6178,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Postavke za web stranice početnu stranicu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} je na čekanju do {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},Zahtjevi za odobrenje nisu dopušteni za {0} zbog položaja {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Napravi račun kupnje
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Koristi lišće
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Kuponi se koriste {1}. Dozvoljena količina se iscrpljuje
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Želite li poslati materijalni zahtjev
 DocType: Job Offer,Awaiting Response,Očekujem odgovor
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6164,6 +6194,7 @@
 DocType: Training Event Employee,Optional,neobavezan
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
+DocType: Sales Order,Skip Delivery Note,Preskočite dostavnicu
 DocType: Price List,Price Not UOM Dependent,Cijena nije UOM ovisna
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,Stvorene su varijante {0}.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Ugovor o razini usluge već postoji.
@@ -6268,6 +6299,7 @@
 DocType: Vehicle,Last Carbon Check,Posljednja Carbon Check
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Pravni troškovi
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Molimo odaberite količinu na red
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Radni nalog {0}: kartica posla nije pronađena za operaciju {1}
 DocType: Purchase Invoice,Posting Time,Vrijeme knjiženja
 DocType: Timesheet,% Amount Billed,% Naplaćeni iznos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Telefonski troškovi
@@ -6370,7 +6402,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma raspoloživog korištenja
 ,Sales Funnel,prodaja dimnjak
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kolica
@@ -6466,6 +6497,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Bodovne bodove izračunat će se iz potrošnje (putem Prodajnog računa), na temelju faktora prikupljanja."
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
+DocType: Pricing Rule,Coupon Code Based,Na temelju koda kupona
 DocType: Company,HRA Settings,Postavke HRA
 DocType: Homepage,Hero Section,Sekcija heroja
 DocType: Employee Transfer,Transfer Date,Datum prijenosa
@@ -6581,6 +6613,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Postavite prazan filtar Tvrtke ako je Skupna pošta &quot;Tvrtka&quot;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Knjiženja Datum ne može biti datum u budućnosti
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Red # {0}: Serijski br {1} ne odgovara {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijsku brojevnu seriju za Attendance putem Postavljanje&gt; Numeriranje serija
 DocType: Stock Entry,Target Warehouse Address,Adresa ciljne skladišta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Casual dopust
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Vrijeme prije početka vremena smjene tijekom kojeg se prijava zaposlenika uzima u obzir za prisustvo.
@@ -6615,7 +6648,6 @@
 DocType: Employee Grade,Employee Grade,Grade zaposlenika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Rad po komadu
 DocType: GSTR 3B Report,June,lipanj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Share Balance,From No,Od br
 DocType: Shift Type,Early Exit Grace Period,Period prijevremenog izlaska iz milosti
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -6900,7 +6932,6 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o razini usluge s tipom entiteta {0} i entitetom {1} već postoji.
 DocType: Journal Entry,Write Off Entry,Otpis unos
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
@@ -7038,6 +7069,7 @@
 DocType: Budget,Warn,Upozoriti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Sve su stavke već prenesene za ovu radnu narudžbu.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
+DocType: Bank Account,Company Account,Račun tvrtke
 DocType: Asset Maintenance,Manufacturing User,Proizvodni korisnik
 DocType: Purchase Invoice,Raw Materials Supplied,Sirovine nabavlja
 DocType: Subscription Plan,Payment Plan,Plan plaćanja
@@ -7079,6 +7111,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u Radnoj nalogu {3}
 DocType: Certification Application,Name of Applicant,Naziv podnositelja zahtjeva
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Vrijeme list za proizvodnju.
+DocType: Quick Stock Balance,Quick Stock Balance,Brzo stanje zaliha
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,suma stavke
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Nije moguće mijenjati svojstva varijanti nakon transakcije zaliha. Morat ćete napraviti novu stavku da to učinite.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA mandat
@@ -7405,6 +7438,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Molimo postavite {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivan učenik
 DocType: Employee,Health Details,Zdravlje Detalji
+DocType: Coupon Code,Coupon Type,Vrsta kupona
 DocType: Leave Encashment,Encashable days,Napadi koji se mogu vezati
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Za izradu referentnog dokumenta zahtjeva za plaćanje potrebno je
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7688,6 +7722,7 @@
 DocType: Hotel Room Package,Amenities,Sadržaji
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Automatski preuzmi Uvjete plaćanja
 DocType: QuickBooks Migrator,Undeposited Funds Account,Neraspoređeni račun sredstava
+DocType: Coupon Code,Uses,koristi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Višestruki zadani način plaćanja nije dopušten
 DocType: Sales Invoice,Loyalty Points Redemption,Otkup lojalnih bodova
 ,Appointment Analytics,Imenovanje Google Analytics
@@ -7704,6 +7739,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Ukupni proračun
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Ostavite prazno ako grupe studenata godišnje unesete
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ako je označeno, Ukupan broj. radnih dana će uključiti odmor, a to će smanjiti vrijednost plaća po danu"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Dodavanje Domene nije uspjelo
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Da biste omogućili primanje / isporuku, ažurirajte &quot;Preplata primanja / Dostava&quot; u Postavkama zaliha ili Stavka."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Aplikacije pomoću trenutnog ključa neće moći pristupiti, jeste li sigurni?"
 DocType: Subscription Settings,Prorate,Proporcionalno podijeliti
@@ -7716,6 +7752,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ako nema dodijeljenog vremenskog intervala, komunikacija će upravljati ovom skupinom"
 DocType: Stock Reconciliation Item,Quantity Difference,Količina razlika
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 ,Electronic Invoice Register,Registar elektroničkih računa
@@ -7969,6 +8006,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Porezi i naknade Umanjenja (Društvo valuta)
 DocType: Item Group,General Settings,Opće postavke
 DocType: Article,Article,Članak
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Unesite kod kupona !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Od valute i valuta ne mogu biti isti
 DocType: Taxable Salary Slab,Percent Deduction,Postotak odbitka
 DocType: GL Entry,To Rename,Za preimenovanje
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 3bb5f7d..25ee33b 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Vevő ügyfélkapcsolat
 DocType: Shift Type,Enable Auto Attendance,Automatikus jelenlét engedélyezése
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,"Kérjük, írja be a Raktár és a dátumot"
 DocType: Lost Reason Detail,Opportunity Lost Reason,Lehetséges ok
 DocType: Patient Appointment,Check availability,Ellenőrizd az elérhetőséget
 DocType: Retention Bonus,Bonus Payment Date,Bónusz fizetési dátuma
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Elvégzett munka rendelések
 DocType: Support Settings,Forum Posts,Fórum hozzászólások
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","A feladat hátteret kapott. Ha a háttérben történő feldolgozás kérdése merül fel, a rendszer megjegyzést fűz a készlet-egyeztetés hibájához, és visszatér a Piszkozat szakaszba"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",Sajnos a kuponkód érvényessége még nem kezdődött meg
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Adóalap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Távollét szabályok részletei
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Fogyóeszközök
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Osztály
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; Márka
 DocType: Restaurant Table,No of Seats,Ülőhelyek  száma
 DocType: Sales Invoice,Overdue and Discounted,Lejárt és kedvezményes
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Hívás megszakítva
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Sor közök az összeg kiírásához
 DocType: Vehicle,Additional Details,További részletek
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Nincs megadott leírás
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Tételek letöltése a raktárból
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Vásárolható rendelés.
 DocType: POS Closing Voucher Details,Collected Amount,Összegyűjtött összeg
 DocType: Lab Test,Submitted Date,Benyújtott dátum
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Tanulás
 ,Trial Balance (Simple),Főkönyvi kivonat (Egyszerű)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Engedélyezze a halasztott költségeket
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Alkalmazott kuponkód
 DocType: Asset,Next Depreciation Date,Következő Értékcsökkenés dátuma
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Alkalmazottankénti Tevékenység költség
 DocType: Accounts Settings,Settings for Accounts,Fiókok beállítása
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Munka rendelés
 DocType: Sales Invoice,Total Qty,Összesen Mennyiség
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Helyettesítő2 e-mail azonosító
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 DocType: Item,Show in Website (Variant),Megjelenítés a weboldalon (Változat)
 DocType: Employee,Health Concerns,Egészségügyi problémák
 DocType: Payroll Entry,Select Payroll Period,Válasszon Bérszámfejtési Időszakot
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Adó visszatartási számla
 DocType: Pricing Rule,Sales Partner,Vevő partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Összes Beszállító eredménymutatói.
+DocType: Coupon Code,To be used to get discount,"Ahhoz, hogy kedvezményt kapjunk"
 DocType: Buying Settings,Purchase Receipt Required,Beszerzési megrendelés nyugta kötelező
 DocType: Sales Invoice,Rail,Sín
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tényleges költség
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Termelési terv
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Számlát létrehozó eszköz megnyitása
 DocType: Salary Component,Round to the Nearest Integer,Kerek a legközelebbi egész számhoz
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,"Hagyja, hogy a készletben nem lévő tételek kosárba kerüljenek"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Értékesítés visszaküldése
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Mennyiség megadása a sorozatszámos bemeneten alapuló tranzakciókhoz
 ,Total Stock Summary,Készlet Összefoglaló
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Alapértelmezett óradíj (Vállalkozás pénznemében)
 ,Qty To Be Billed,Mennyit kell számlázni
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Szállított érték
+DocType: Coupon Code,Gift Card,Ajándékkártya
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Fenntartott termelési mennyiség: alapanyagok mennyisége a gyártáshoz.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Visszaváltási dátum
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Ez a banki tranzakció már teljesen egyezik
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Időablak létrehozása
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,A {0} számlát már többször bevitték
 DocType: Account,Expenses Included In Valuation,Készletértékelésbe belevitt költségek
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Vásárlási számlák
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Csak akkor tudja megújítani, ha tagsága lejár 30 napon belül"
 DocType: Shopping Cart Settings,Show Stock Availability,Raktárkészlet elérhetőségének megjelenítése
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},"Állítsa {0} a vagyontárgy ketegóriát: {1}, vagy a vállalkozást: {2}"
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserved Mennyiség: Rendelhető mennyiség eladó, de nem teljesített."
 DocType: Drug Prescription,Interval UOM,Intervallum mértékegysége
 DocType: Customer,"Reselect, if the chosen address is edited after save","Újra válassza ki, ha a kiválasztott cím szerkesztésre került a mentés után"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Fenntartott mennyiség az alvállalkozók számára: Nyersanyag-mennyiség az alhúzásokhoz.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Fenntartott mennyiség az alvállalkozók számára: Nyersanyag-mennyiség az alhúzásokhoz.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
 DocType: Item,Hub Publishing Details,Hub közzétételének részletei
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',"""Nyitás"""
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Elemek és UOM-ok importálása
 DocType: Repayment Schedule,Balance Loan Amount,Hitel összeg mérlege
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Hozzáadva a részletekhez
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Sajnáljuk, a kuponkód kimerült"
 DocType: Communication Medium,Catch All,Catch All
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Menetrend pálya
 DocType: Budget,Applicable on Material Request,Az anyagkérelemkor alkalmazható
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Érvénytelen Jellemző
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} be kell nyújtani
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,E-mail kampányok
+DocType: Sales Partner,To Track inbound purchase,A bejövő vásárlás nyomon követése
 DocType: Buying Settings,Default Supplier Group,Alapértelmezett beszállítói csoport
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Mennyiségnek kisebb vagy egyenlő legyen mint {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},A (z) {0} összetevőre jogosult maximális mennyiség meghaladja: {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Nyilvántartásba vétel
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel foglalás felhasználó
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Állapot beállítása
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; Számozási sorozat segítségével"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Kérjük, válasszon prefix először"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa a Naming sorozatot a (z) {0} beállításra a Beállítás&gt; Beállítások&gt; Sorozat elnevezése menüpont alatt"
 DocType: Contract,Fulfilment Deadline,Teljesítési határidő
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Közel hozzád
 DocType: Student,O-,ALK-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Felülvizsgálat alatt
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Sikertelen bejelentkezés
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,A  {0}  vagyontárgy létrehozva
+DocType: Coupon Code,Promotional,Promóciós
 DocType: Special Test Items,Special Test Items,Különleges vizsgálati tételek
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,"Ahhoz, hogy regisztráljon a Marketplace-re, be kell jelentkeznie a System Manager és a Item Manager szerepekkel."
 apps/erpnext/erpnext/config/buying.py,Key Reports,Főbb jelentések
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Az értékesítési csoport teljes lefoglalt százaléka  100 kell legyen
 DocType: Subscription Plan,Billing Interval Count,Számlázási időtartam számláló
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Vizitek és a beteg látogatások
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Érték hiányzik
 DocType: Employee,Department and Grade,Osztály és osztály
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Kezdetének és befejezésének időpontjai
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Szerződései sablon teljesítési feltételei
 ,Delivered Items To Be Billed,Számlázandó kiszállított tétel
+DocType: Coupon Code,Maximum Use,Maximális felhasználás
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Anyagj.: {0} megnyitása
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,A sorozatszámhoz tartozó raktárat nem lehet megváltoztatni.
 DocType: Authorization Rule,Average Discount,Átlagos kedvezmény
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,Leltár
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Töltse le Json néven
 DocType: Item,Sales Details,Értékesítés részletei
+DocType: Coupon Code,Used,Használt
 DocType: Opportunity,With Items,Tételekkel
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',A (z) {0} kampány már létezik a (z) {1} &#39;{2}&#39; kampányhoz
 DocType: Asset Maintenance,Maintenance Team,Karbantartó csoport
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",A (z) {0} tételhez nem található aktív BOM. Nem biztosítható a \ Serial No \ Delivery
 DocType: Sales Partner,Sales Partner Target,Vevő partner cél
 DocType: Loan Type,Maximum Loan Amount,Maximális hitel összeg
-DocType: Pricing Rule,Pricing Rule,Árképzési szabály
+DocType: Coupon Code,Pricing Rule,Árképzési szabály
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Ismétlődő lajstromszám ehhez a hallgatóhoz: {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Anyagigénylés -&gt; Beszerzési megrendelésre
 DocType: Company,Default Selling Terms,Alapértelmezett eladási feltételek
@@ -2774,6 +2788,7 @@
 DocType: Payment Schedule,Payment Amount,Kifizetés összege
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Félnapos dátumának a munka kezdési és a befejező dátum köztinek kell lennie
 DocType: Healthcare Settings,Healthcare Service Items,Egészségügyi szolgáltatási tételek
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Érvénytelen vonalkód. Ehhez a vonalkódhoz nincs csatolt elem.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Elfogyasztott mennyiség
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Nettó készpénz változás
 DocType: Assessment Plan,Grading Scale,Osztályozás időszak
@@ -2893,7 +2908,6 @@
 DocType: Share Transfer,Asset Account,Vagyontárgy-számla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Az új kiadási dátumnak a jövőben kell lennie
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszakra
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; HR beállítások menüpontban"
 DocType: Lab Test,Technician Name,Technikus neve
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3005,6 +3019,7 @@
 DocType: Products Settings,Hide Variants,Variánsok elrejtése
 DocType: Lead,Next Contact By,Következő kapcsolat evvel
 DocType: Compensatory Leave Request,Compensatory Leave Request,Kompenzációs távolléti kérelem
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","A (z) {1} sorban a (z) {0} tételnél nem lehet túlterhelni, mint {2}. A túlszámlázás engedélyezéséhez kérjük, állítsa be a kedvezményt a Fiókbeállítások között"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},"Szükséges mennyiség ebből a tételből {0}, ebben a sorban {1}"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},"{0} Raktárat nem lehet törölni, mint a {1} tételre létezik mennyiség"
 DocType: Blanket Order,Order Type,Rendelés típusa
@@ -3174,7 +3189,6 @@
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Rrendelkezik változatokkal
 DocType: Employee Benefit Claim,Claim Benefit For,A kártérítési igény
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","A (z) {1} sorban a (z) {0} tételnél nem lehet túlterhelni, mint {2}. A túlszámlázás engedélyezéséhez kérjük, állítsa be a Készletbeállításokba"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Frissítse a válaszadást
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3464,6 +3478,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,"Kérjük, adja meg a vállalkozás pénznemét"
 DocType: Workstation,Wages per hour,Bérek óránként
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurálás: {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Készlet egyenleg ebben a kötegben: {0} negatívvá válik {1} erre a tételre: {2} ebben a raktárunkban: {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Következő Anyag igénylések merültek fel  automatikusan a Tétel újra-rendelés szinje alpján
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
@@ -3793,6 +3808,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Bérpapír küldés
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Feltartva
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,A kérdésnek legalább egy helyes opcióval kell rendelkeznie
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Megrendelések
 DocType: Account,Inter Company Account,Inter vállalkozási számla
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Csoportos importálás
 DocType: Sales Partner,Address & Contacts,Címek és Kapcsolattartók
@@ -3803,6 +3819,7 @@
 DocType: POS Profile,[Select],[Válasszon]
 DocType: Staffing Plan Detail,Number Of Positions,Pozíciók száma
 DocType: Vital Signs,Blood Pressure (diastolic),Vérnyomás (diasztolik)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,"Kérjük, válassza ki az ügyfelet."
 DocType: SMS Log,Sent To,Elküldve
 DocType: Agriculture Task,Holiday Management,Távollétek kezelése
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla létrehozás
@@ -4012,7 +4029,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} nem nyújtják be
 DocType: Subscription,Trialling,kísérleti
 DocType: Sales Invoice Item,Deferred Revenue,Halasztott bevétel
-DocType: Bank Account,GL Account,GL számla
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Készpénzszámla kerül használatra az értékesítési számla létrehozásakor
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Mentesség alkategóriája
 DocType: Member,Membership Expiry Date,Tagság lejárati idő
@@ -4415,13 +4431,13 @@
 DocType: C-Form Invoice Detail,Territory,Terület
 DocType: Pricing Rule,Apply Rule On Item Code,Alkalmazza a cikk kódját
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Kérjük említse meg a szükséges résztvevők számát
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Készletmérleg-jelentés
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Részvételi díj
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Összesített összeg megjelenítése
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Frissítés folyamatban. Ez eltarthat egy ideig.
 DocType: Production Plan Item,Produced Qty,Termelt mennyiség
 DocType: Vehicle Log,Fuel Qty,Üzemanyag menny.
-DocType: Stock Entry,Target Warehouse Name,Cél raktár neve
 DocType: Work Order Operation,Planned Start Time,Tervezett kezdési idő
 DocType: Course,Assessment,Értékelés
 DocType: Payment Entry Reference,Allocated,Lekötött
@@ -4487,10 +4503,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Általános Szerződési Feltételek az Ertékesítés- és a Beszerzéshez. Példák: 1. Az ajánlat érvényessége. 1. Fizetési feltételek (Előre, Hitelre, részben előre stb.). 1. Mi az extra (vagy a vevő által fizetendő). 1. Biztonsági / használati figyelmeztetést. 1. Garancia, ha van ilyen. 1. Garancia kezelésének irányelve. 1. Szállítási feltételek, ha van ilyen. 1. Viták kezelése, kártérítés, felelősségvállalás, titoktartás stb. 1. Vállalatának címe és kapcsolattartási elérhetősége."
 DocType: Homepage Section,Section Based On,Szakasz alapján
+DocType: Shopping Cart Settings,Show Apply Coupon Code,A kuponkód alkalmazása
 DocType: Issue,Issue Type,Probléma típus
 DocType: Attendance,Leave Type,Távollét típusa
 DocType: Purchase Invoice,Supplier Invoice Details,Beszállító Számla részletek
 DocType: Agriculture Task,Ignore holidays,Ünnepek figyelmen kívül hagyása
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Kuponfeltételek hozzáadása / szerkesztése
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Költség / Különbség számla ({0}) ,aminek ""Nyereség és Veszteség""  számlának kell lennie"
 DocType: Stock Entry Detail,Stock Entry Child,Stock Entry gyermek
 DocType: Project,Copied From,Innen másolt
@@ -4665,6 +4683,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Értékelési Terv kritériumai
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,tranzakciók
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Vásárlási megrendelések megakadályozása
+DocType: Coupon Code,Coupon Name,Kupon neve
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Fogékony
 DocType: Email Campaign,Scheduled,Ütemezett
 DocType: Shift Type,Working Hours Calculation Based On,Munkaidő számítása alapján
@@ -4681,7 +4700,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Hozzon létre változatok
 DocType: Vehicle,Diesel,Dízel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Árlista pénzneme nincs kiválasztva
+DocType: Quick Stock Balance,Available Quantity,elérhető mennyiség
 DocType: Purchase Invoice,Availed ITC Cess,Hasznosított ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; Oktatási beállítások részben"
 ,Student Monthly Attendance Sheet,Tanuló havi jelenléti ív
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Csak az értékesítésre vonatkozó szállítási szabály
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a vétel időpontja előtti
@@ -4748,8 +4769,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
 DocType: Quality Meeting,Quality Meeting,Minőségi találkozó
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Csoport nélküliek csoportokba
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa a Naming sorozatot a (z) {0} beállításra a Beállítás&gt; Beállítások&gt; Sorozat elnevezése menüpont alatt"
 DocType: Employee,ERPNext User,ERPNext felhasználó
+DocType: Coupon Code,Coupon Description,Kupon leírás
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Köteg kötelező ebben a sorban {0}
 DocType: Company,Default Buying Terms,Alapértelmezett vásárlási feltételek
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Beszerzési nyugta tételek beszállítva
@@ -4912,6 +4933,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Ellen Dokument Részlet sz.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Törlés a (z) {0} országban nincs engedélyezve
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Ügyfél típus kötelező
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Alkalmazza a kuponkódot
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",A (z) {0} álláskártya esetén csak az „Anyagátadás a gyártáshoz” típusú készletbejegyzés lehetséges
 DocType: Quality Inspection,Outgoing,Kimenő
 DocType: Customer Feedback Table,Customer Feedback Table,Ügyfél-visszajelzési táblázat
@@ -5061,7 +5083,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Megrendelés benyújtásakor
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Összes beszállító hozzáadása
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"# {0} sor: elkülönített összeg nem lehet nagyobb, mint fennálló összeg."
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 DocType: Tally Migration,Parties,A felek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Keressen anyagjegyzéket
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Záloghitel
@@ -5093,7 +5114,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Nem engedélyezhető az {0} tételre az alternatív tétel változat beállítása
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Hitelesített aláírás
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; Oktatási beállítások menüben"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Nettó ITC elérhető (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Díjak létrehozása
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költsége (Beszerzési számla alapján)
@@ -5118,6 +5138,7 @@
 DocType: Quiz Result,Wrong,Rossz
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Arány, amelyen az Árlista pénznemét átalakítja az Ügyfél alapértelmezett pénznemére"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettó összeg (Társaság pénznemében)
+DocType: Sales Partner,Referral Code,hivatkozási kód
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,"A teljes előleg összege nem lehet nagyobb, mint a teljes szankcionált összege"
 DocType: Salary Slip,Hour Rate,Óra árértéke
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Engedélyezze az automatikus újrarendelést
@@ -5246,6 +5267,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Készlet mennyiség megjelenítése
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Származó nettó a műveletekből
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},"{0} sor: Az állapotnak {1} kell lennie, ha a számlát diszkontáljuk. {2}"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {1}) nem található az elemre: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,4. tétel
 DocType: Student Admission,Admission End Date,Felvételi Végdátum
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Alvállalkozói
@@ -5268,6 +5290,7 @@
 DocType: Travel Request,Fully Sponsored,Teljesen szponzorált
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Fordított naplóbejegyzés
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Hozzon létre Munkalapot
+DocType: Quotation,Referral Sales Partner,Referral Sales Partner
 DocType: Quality Procedure Process,Process Description,Folyamatleírás
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,A(z)  {0} vevő létrehozva.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Jelenleg nincs raktárkészlet egyik raktárban sem
@@ -5402,6 +5425,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Anyagjegyzék Díjszabási ár
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Feltöltött fájl olvasása
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","A Megszakított Munka Rendelést nem lehet törölni,  először folytassa a megszüntetéshez"
+DocType: Coupon Code,Coupon Code,Kupon kód
 DocType: Asset,Journal Entry for Scrap,Naplóbejegyzés selejtezéshez
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,"Kérjük, vegye kia a tételeket a szállítólevélből"
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},{0} sor: válassza ki a munkaállomást a művelet ellen {1}
@@ -5484,6 +5508,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,A „dátum” kötelező
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Adatok importálása és exportálása
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",Sajnos a kuponkód érvényessége lejárt
 DocType: Bank Account,Account Details,Számla adatok
 DocType: Crop,Materials Required,Szükséges anyagok
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Nem talált diákokat
@@ -5521,6 +5546,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Menjen a felhasználókhoz
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,"Fizetett összeg + Leírható összeg nem lehet nagyobb, mint a Teljes összeg"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} nem érvényes Köteg szám ehhez a tételhez {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,"Kérjük, érvényes kuponkódot írjon be !!"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Megjegyzés: Nincs elég távollét egyenlege erre a távollét típusra {0}
 DocType: Task,Task Description,Feladatleírás
 DocType: Training Event,Seminar,Szeminárium
@@ -5784,6 +5810,7 @@
 ,TDS Payable Monthly,TDS fizethető havonta
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Queue a BOM cseréjéhez. Néhány percig tarthat.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; HR beállítások menüpontban"
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Összes kifizetés
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Széria számok szükségesek a sorbarendezett  tételhez: {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Kifizetések és számlák főkönyvi egyeztetése
@@ -5873,6 +5900,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Nyersanyagok beszerzése a termeléshez
 DocType: Job Opening,Job Title,Állás megnevezése
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Jövőbeli fizetés Ref
+DocType: Quotation,Additional Discount and Coupon Code,További kedvezmény és kuponkód
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} azt jelzi, hogy a {1} nem ad meg árajnlatot, de az összes tétel \ már kiajánlott. Az Árajánlatkérés státuszának frissítése."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Maximum minták - {0} már tároltak a {1} köteghez és {2} tételhez a  {3} kötegben.
@@ -6100,6 +6128,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Beállítások az internetes honlaphoz
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},"{0} tartásban van, eddig {1}"
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},"Árajánlat nem engedélyezett erre: {0}, a mutatószám állás amiatt: {1}"
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Beszerzési számla készítése
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Felhasznált távollétek
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Szeretné benyújtani az anyagkérelmet
 DocType: Job Offer,Awaiting Response,Várakozás válaszra
@@ -6114,6 +6143,7 @@
 DocType: Training Event Employee,Optional,Választható
 DocType: Salary Slip,Earning & Deduction,Jövedelem és levonás
 DocType: Agriculture Analysis Criteria,Water Analysis,Vízelemzés
+DocType: Sales Order,Skip Delivery Note,Átugrani a szállítólevelet
 DocType: Price List,Price Not UOM Dependent,Az ár nem UOM-tól függ
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} változatokat hoztak létre.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Az alapértelmezett szolgáltatási szintű megállapodás már létezik.
@@ -6319,7 +6349,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadva
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a rendelkezésre álló felhasználási dátuma előtt
 ,Sales Funnel,Értékesítési csatorna
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Rövidítés kötelező
 DocType: Project,Task Progress,Feladat előrehaladása
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kosár
@@ -6414,6 +6443,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",A hűségpontokat az elköltött összegből (az értékesítési számlán keresztül) kell kiszámítani az említett begyűjtési tényező alapján.
 DocType: Program Enrollment Tool,Enroll Students,Diákok felvétele
+DocType: Pricing Rule,Coupon Code Based,Kuponkód alapján
 DocType: Company,HRA Settings,HRA beállítások
 DocType: Homepage,Hero Section,Hős szakasz
 DocType: Employee Transfer,Transfer Date,Utalás dátuma
@@ -6529,6 +6559,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',"Kérjük, állítsa Vállakozás szűrését üresre, ha a csoportosítás beállítása 'Vállalkozás'"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Könyvelési dátum nem lehet jövőbeni időpontban
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Sor # {0}: Sorszám {1} nem egyezik a {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; Számozási sorozat segítségével"
 DocType: Stock Entry,Target Warehouse Address,Cél raktár címe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Alkalmi távollét
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"A műszak indulása előtti idő, amely során a munkavállalói bejelentkezést figyelembe veszik a részvételhez."
@@ -6563,7 +6594,6 @@
 DocType: Employee Grade,Employee Grade,Alkalmazott fokozat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Darabszámra fizetett munka
 DocType: GSTR 3B Report,June,június
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 DocType: Share Balance,From No,Ettől
 DocType: Shift Type,Early Exit Grace Period,Korai kilépési türelmi idő
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
@@ -6848,7 +6878,6 @@
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Kérjük, adja be Beosztás jóváhagyásra vagy Felhasználó jóváhagyásra"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {1}) nem található az elemhez: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Szolgáltatási szintű megállapodás a (z) {0} típusú entitással és a {1} entitással már létezik.
 DocType: Journal Entry,Write Off Entry,Leíró Bejegyzés
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
@@ -6986,6 +7015,7 @@
 DocType: Budget,Warn,Figyelmeztet
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Az összes tétel már átkerült ehhez a Munka Rendeléshez.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bármely egyéb megjegyzések, említésre méltó erőfeszítés, aminek a nyilvántartásba kell kerülnie."
+DocType: Bank Account,Company Account,Vállalati számla
 DocType: Asset Maintenance,Manufacturing User,Gyártás Felhasználó
 DocType: Purchase Invoice,Raw Materials Supplied,Alapanyagok leszállítottak
 DocType: Subscription Plan,Payment Plan,Fizetési ütemterv
@@ -7027,6 +7057,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) nem lehet nagyobb a ({2}) tervezett mennyiségnél  a {3} Munka Rendelésnél
 DocType: Certification Application,Name of Applicant,Jelentkező neve
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Idő nyilvántartó a gyártáshoz.
+DocType: Quick Stock Balance,Quick Stock Balance,Gyors készletmérleg
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Részösszeg
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,A variánsok tulajdonságai nem módosíthatók a készletesítés után. Ehhez új tételt kell készíteni.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA utalási megbízás
@@ -7353,6 +7384,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},"Kérjük, állítsa be {0}"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} inaktív tanuló
 DocType: Employee,Health Details,Egészségügyi adatok
+DocType: Coupon Code,Coupon Type,Kupon típusa
 DocType: Leave Encashment,Encashable days,Beágyazható napok
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Kifizetés iránti kérelem létrehozásához referencia dokumentum szükséges
 DocType: Soil Texture,Sandy Clay,Homokos agyag
@@ -7635,6 +7667,7 @@
 DocType: Hotel Room Package,Amenities,Felszerelések
 DocType: Accounts Settings,Automatically Fetch Payment Terms,A fizetési feltételek automatikus lehívása
 DocType: QuickBooks Migrator,Undeposited Funds Account,Nem támogatott alapok számlája
+DocType: Coupon Code,Uses,felhasználások
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Több alapértelmezett fizetési mód nem engedélyezett
 DocType: Sales Invoice,Loyalty Points Redemption,Hűségpontok visszaváltása
 ,Appointment Analytics,Vizit időpontok elemzései
@@ -7651,6 +7684,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Teljes költségvetés
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Hagyja üresen, ha diák csoportokat évente hozza létre"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja az ünnepeket, és ez csökkenti a napi bér összegét"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Nem sikerült hozzáadni a tartományt
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",A túllépés / kézbesítés engedélyezéséhez frissítse a &quot;Túlérvényesítési / szállítási támogatás&quot; elemet a Készletbeállításokban vagy az elemben.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Az aktuális kulcsot használó alkalmazások nem fognak hozzáférni, biztos ebben?"
 DocType: Subscription Settings,Prorate,Megosztási
@@ -7663,6 +7697,7 @@
 ,BOM Stock Report,Anyagjegyzék készlet jelentés
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ha nincs hozzárendelt időrés, akkor a kommunikációt ez a csoport kezeli"
 DocType: Stock Reconciliation Item,Quantity Difference,Mennyiség különbség
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,Követelés összege
 ,Electronic Invoice Register,Elektronikus számlanyilvántartás
@@ -7916,6 +7951,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Levont adók és költségek (a vállalkozás pénznemében)
 DocType: Item Group,General Settings,Általános beállítások
 DocType: Article,Article,Cikk
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,"Kérjük, írja be a kuponkódot !!"
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Pénznemből és pénznembe nem lehet ugyanaz
 DocType: Taxable Salary Slab,Percent Deduction,Százalékos levonás
 DocType: GL Entry,To Rename,Átnevezni
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 8e29ff6..127cc57 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Kontak Pelanggan
 DocType: Shift Type,Enable Auto Attendance,Aktifkan Kehadiran Otomatis
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Silakan masukkan Gudang dan Tanggal
 DocType: Lost Reason Detail,Opportunity Lost Reason,Peluang Hilang Alasan
 DocType: Patient Appointment,Check availability,Cek ketersediaan
 DocType: Retention Bonus,Bonus Payment Date,Tanggal Pembayaran Bonus
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Perintah Kerja Selesai
 DocType: Support Settings,Forum Posts,Kiriman Forum
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Tugas telah ditetapkan sebagai pekerjaan latar belakang. Jika ada masalah pada pemrosesan di latar belakang, sistem akan menambahkan komentar tentang kesalahan Rekonsiliasi Saham ini dan kembali ke tahap Konsep"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Maaf, validitas kode kupon belum dimulai"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Jumlah Kena Pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Anda tidak diizinkan menambah atau memperbarui entri sebelum {0}
 DocType: Leave Policy,Leave Policy Details,Tinggalkan Detail Kebijakan
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Kelas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 DocType: Restaurant Table,No of Seats,Tidak ada tempat duduk
 DocType: Sales Invoice,Overdue and Discounted,Tunggakan dan Diskon
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Panggilan Terputus
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,spasi untuk jumlah kata
 DocType: Vehicle,Additional Details,Rincian Tambahan
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Tidak diberikan deskripsi
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Ambil Item dari Gudang
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Form Permintaan pembelian.
 DocType: POS Closing Voucher Details,Collected Amount,Jumlah yang Dikumpulkan
 DocType: Lab Test,Submitted Date,Tanggal dikirim
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Belajar
 ,Trial Balance (Simple),Balance Trial (Sederhana)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Aktifkan Beban Ditangguhkan
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Kode Kupon Terapan
 DocType: Asset,Next Depreciation Date,Berikutnya Penyusutan Tanggal
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Biaya Aktivitas Per Karyawan
 DocType: Accounts Settings,Settings for Accounts,Pengaturan Akun
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Perintah kerja
 DocType: Sales Invoice,Total Qty,Jumlah Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Item,Show in Website (Variant),Tampilkan Website (Variant)
 DocType: Employee,Health Concerns,Kekhawatiran Kesehatan
 DocType: Payroll Entry,Select Payroll Period,Pilih Payroll Periode
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Akun Pemotongan Pajak
 DocType: Pricing Rule,Sales Partner,Mitra Penjualan
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Semua kartu pemilih Pemasok.
+DocType: Coupon Code,To be used to get discount,Digunakan untuk mendapatkan diskon
 DocType: Buying Settings,Purchase Receipt Required,Diperlukan Nota Penerimaan
 DocType: Sales Invoice,Rail,Rel
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Harga asli
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Rencana produksi
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Membuka Invoice Creation Tool
 DocType: Salary Component,Round to the Nearest Integer,Membulatkan ke Integer Terdekat
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Izinkan item yang tidak ada stok ditambahkan ke troli
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Retur Penjualan
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Tentukan Qty dalam Transaksi berdasarkan Serial No Input
 ,Total Stock Summary,Ringkasan Persediaan Total
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Dasar Tarif Perjam (Mata Uang Perusahaan)
 ,Qty To Be Billed,Qty To Be Billed
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Jumlah Telah Terikirim
+DocType: Coupon Code,Gift Card,Kartu ucapan
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Jumlah Pesanan untuk Produksi: Jumlah bahan baku untuk membuat barang-barang manufaktur.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Tanggal Penebusan
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Transaksi bank ini sudah sepenuhnya direkonsiliasi
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Buat absen
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Beli Faktur
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Anda hanya bisa memperpanjang jika keanggotaan Anda akan berakhir dalam 30 hari
 DocType: Shopping Cart Settings,Show Stock Availability,Tampilkan Ketersediaan Stok
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Setel {0} dalam kategori aset {1} atau perusahaan {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserved Qty: Jumlah memerintahkan untuk dijual, tapi tidak disampaikan."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Pilih ulang, jika alamat yang dipilih diedit setelah simpan"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Jumlah Pesanan untuk Sub-kontrak: Kuantitas bahan baku untuk membuat barang-barang yang disubsidi.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Jumlah Pesanan untuk Sub-kontrak: Kuantitas bahan baku untuk membuat barang-barang yang disubsidi.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 DocType: Item,Hub Publishing Details,Rincian Hub Publishing
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','Awal'
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Mengimpor Item dan UOM
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Jumlah Pinjaman
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Ditambahkan ke detail
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Maaf, kode kupon habis"
 DocType: Communication Medium,Catch All,Tangkap Semua
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Jadwal Kursus
 DocType: Budget,Applicable on Material Request,Berlaku pada Permintaan Material
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atribut yang tidak valid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} harus dikirim
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Kampanye Email
+DocType: Sales Partner,To Track inbound purchase,Untuk Melacak pembelian masuk
 DocType: Buying Settings,Default Supplier Group,Grup Pemasok Default
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Jumlah maksimum yang memenuhi syarat untuk komponen {0} melebihi {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Masuk Stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Reservasi Hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Setel Status
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Silakan pilih awalan terlebih dahulu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Contract,Fulfilment Deadline,Batas Waktu Pemenuhan
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Di dekat Anda
 DocType: Student,O-,HAI-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Dalam Ulasan
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Gagal untuk masuk
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Aset {0} dibuat
+DocType: Coupon Code,Promotional,Promosi
 DocType: Special Test Items,Special Test Items,Item Uji Khusus
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Anda harus menjadi pengguna dengan peran Manajer Sistem dan Manajer Item untuk mendaftar di Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Laporan Utama
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Type
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
 DocType: Subscription Plan,Billing Interval Count,Jumlah Interval Penagihan
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Janji dan Pertemuan Pasien
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Nilai hilang
 DocType: Employee,Department and Grade,Departemen dan Grade
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Mulai dan Akhir Tanggal
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Ketentuan Pemenuhan Template Kontrak
 ,Delivered Items To Be Billed,Produk Terkirim untuk Ditagih
+DocType: Coupon Code,Maximum Use,Penggunaan Maksimum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Terbuka BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Gudang tidak dapat diubah untuk Serial Number
 DocType: Authorization Rule,Average Discount,Rata-rata Diskon
@@ -2566,6 +2579,7 @@
 DocType: Item,Inventory,Inventarisasi
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Unduh sebagai Json
 DocType: Item,Sales Details,Detail Penjualan
+DocType: Coupon Code,Used,Bekas
 DocType: Opportunity,With Items,Dengan Produk
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampanye &#39;{0}&#39; sudah ada untuk {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Tim Pemeliharaan
@@ -2695,7 +2709,7 @@
 						Serial No cannot be ensured",Tidak ada BOM aktif yang ditemukan untuk item {0}. Pengiriman oleh \ Serial Tidak dapat dipastikan
 DocType: Sales Partner,Sales Partner Target,Sasaran Mitra Penjualan
 DocType: Loan Type,Maximum Loan Amount,Maksimum Jumlah Pinjaman
-DocType: Pricing Rule,Pricing Rule,Aturan Harga
+DocType: Coupon Code,Pricing Rule,Aturan Harga
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Nomor pengguliran duplikat untuk siswa {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Permintaan Material untuk Order Pembelian
 DocType: Company,Default Selling Terms,Ketentuan Penjualan Default
@@ -2774,6 +2788,7 @@
 DocType: Payment Schedule,Payment Amount,Jumlah pembayaran
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Setengah Hari Tanggal harus di antara Work From Date dan Work End Date
 DocType: Healthcare Settings,Healthcare Service Items,Item Layanan Perawatan Kesehatan
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Kode Batang Tidak Valid. Tidak ada Barang yang terlampir pada barcode ini.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Assessment Plan,Grading Scale,Skala penilaian
@@ -2893,7 +2908,6 @@
 DocType: Share Transfer,Asset Account,Akun Aset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Tanggal rilis baru harus di masa depan
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Lab Test,Technician Name,Nama teknisi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3004,6 +3018,7 @@
 DocType: Products Settings,Hide Variants,Sembunyikan Varian
 DocType: Lead,Next Contact By,Kontak Selanjutnya Oleh
 DocType: Compensatory Leave Request,Compensatory Leave Request,Permintaan Tinggalkan Kompensasi
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Tidak dapat menagih berlebih untuk Item {0} di baris {1} lebih dari {2}. Untuk memungkinkan penagihan berlebih, harap setel kelonggaran di Pengaturan Akun"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Kuantitas yang dibutuhkan untuk Item {0} di baris {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Gudang {0} tidak dapat dihapus karena ada kuantitas untuk Item {1}
 DocType: Blanket Order,Order Type,Tipe Order
@@ -3173,7 +3188,6 @@
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
 DocType: Employee Benefit Claim,Claim Benefit For,Manfaat Klaim Untuk
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Tidak dapat membebani Item {0} pada baris {1} lebih dari {2}. Untuk mengizinkan over-billing, silahkan atur di Stock Settings"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Perbarui Tanggapan
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3464,6 +3478,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Silakan tentukan mata uang di Perusahaan
 DocType: Workstation,Wages per hour,Upah per jam
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Konfigurasikan {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Saldo Persediaan di Batch {0} akan menjadi negatif {1} untuk Barang {2} di Gudang {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Berikut Permintaan Bahan telah dibesarkan secara otomatis berdasarkan tingkat re-order Item
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
@@ -3793,6 +3808,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Kirim Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Tertahan
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Qustion harus memiliki setidaknya satu opsi yang benar
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Order pembelian
 DocType: Account,Inter Company Account,Akun Perusahaan Inter
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Impor Secara massal
 DocType: Sales Partner,Address & Contacts,Alamat & Kontak
@@ -3803,6 +3819,7 @@
 DocType: POS Profile,[Select],[Pilih]
 DocType: Staffing Plan Detail,Number Of Positions,Jumlah Posisi
 DocType: Vital Signs,Blood Pressure (diastolic),Tekanan Darah (diastolik)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Silakan pilih pelanggan.
 DocType: SMS Log,Sent To,Dikirim Ke
 DocType: Agriculture Task,Holiday Management,Manajemen liburan
 DocType: Payment Request,Make Sales Invoice,Buat Faktur Penjualan
@@ -4012,7 +4029,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} belum dikirim
 DocType: Subscription,Trialling,Trialling
 DocType: Sales Invoice Item,Deferred Revenue,Pendapatan tangguhan
-DocType: Bank Account,GL Account,Akun GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Cash Account akan digunakan untuk kreasi Sales Invoice
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Sub Kategori Pembebasan
 DocType: Member,Membership Expiry Date,Tanggal Kedaluwarsa Keanggotaan
@@ -4436,13 +4452,13 @@
 DocType: C-Form Invoice Detail,Territory,Wilayah
 DocType: Pricing Rule,Apply Rule On Item Code,Terapkan Aturan Pada Item Kode
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Laporan Neraca Stok
 DocType: Stock Settings,Default Valuation Method,Metode Perhitungan Standar
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Biaya
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Tampilkan Jumlah Kumulatif
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Perbaruan sedang berlangsung. Mungkin perlu beberapa saat.
 DocType: Production Plan Item,Produced Qty,Diproduksi Qty
 DocType: Vehicle Log,Fuel Qty,BBM Qty
-DocType: Stock Entry,Target Warehouse Name,Target Nama Gudang
 DocType: Work Order Operation,Planned Start Time,Rencana Start Time
 DocType: Course,Assessment,Penilaian
 DocType: Payment Entry Reference,Allocated,Dialokasikan
@@ -4508,10 +4524,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Syarat dan Ketentuan Standar yang dapat ditambahkan ke Penjualan dan Pembelian. Contoh : 1. Validitas tawaran. 1. Termin Pembayaran (Pembayaran Dimuka, Secara Kredit, pembayaran dimuka sebagian, dll). 1. Apa yang ekstra (atau dibayar oleh Pelanggan). 1. Peringatan keamanan / penggunaan. 1. Garansi jika ada. 1. Kebijakan Retur. 1. Syarat pengiriman, jika berlaku. 1. Cara menangani sengketa, ganti rugi, kewajiban, dll. 1. Alamat dan Kontak Perusahaan Anda."
 DocType: Homepage Section,Section Based On,Bagian Berdasarkan
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Tampilkan Terapkan Kode Kupon
 DocType: Issue,Issue Type,Jenis Isu
 DocType: Attendance,Leave Type,Cuti Type
 DocType: Purchase Invoice,Supplier Invoice Details,Pemasok Rincian Faktur
 DocType: Agriculture Task,Ignore holidays,Abaikan hari libur
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Tambah / Edit Ketentuan Kupon
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Beban akun / Difference ({0}) harus akun 'Laba atau Rugi'
 DocType: Stock Entry Detail,Stock Entry Child,Anak Masuk Stock
 DocType: Project,Copied From,Disalin dari
@@ -4686,6 +4704,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Kriteria Rencana Penilaian
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transaksi
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Cegah Pesanan Pembelian
+DocType: Coupon Code,Coupon Name,Nama Kupon
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Rentan
 DocType: Email Campaign,Scheduled,Dijadwalkan
 DocType: Shift Type,Working Hours Calculation Based On,Perhitungan Jam Kerja Berdasarkan
@@ -4702,7 +4721,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Buat Varian
 DocType: Vehicle,Diesel,disel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Daftar Harga Mata uang tidak dipilih
+DocType: Quick Stock Balance,Available Quantity,Jumlah yang tersedia
 DocType: Purchase Invoice,Availed ITC Cess,Dilengkapi ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 ,Student Monthly Attendance Sheet,Mahasiswa Lembar Kehadiran Bulanan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Aturan pengiriman hanya berlaku untuk penjualan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tanggal Pembelian
@@ -4769,8 +4790,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Baris {0}: Uang muka dari Pelanggan harus kredit
 DocType: Quality Meeting,Quality Meeting,Rapat Kualitas
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group untuk Grup
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Employee,ERPNext User,Pengguna ERPNext
+DocType: Coupon Code,Coupon Description,Deskripsi Kupon
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch wajib di baris {0}
 DocType: Company,Default Buying Terms,Ketentuan Pembelian Default
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Nota Penerimaan Stok Barang Disediakan
@@ -4933,6 +4954,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Terhadap Detail Dokumen No.
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Penghapusan tidak diizinkan untuk negara {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Partai Type adalah wajib
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Terapkan Kode Kupon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Untuk kartu pekerjaan {0}, Anda hanya dapat membuat entri stok jenis &#39;Transfer Bahan untuk Pembuatan&#39;"
 DocType: Quality Inspection,Outgoing,Keluaran
 DocType: Customer Feedback Table,Customer Feedback Table,Tabel Umpan Balik Pelanggan
@@ -5082,7 +5104,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Pengajuan Pesanan Pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tambahkan Semua Pemasok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Baris # {0}: Alokasi Jumlah tidak boleh lebih besar dari jumlah yang terutang.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Tally Migration,Parties,Pesta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Pinjaman Aman
@@ -5114,7 +5135,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tidak memungkinkan untuk mengatur item alternatif untuk item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Tanggal diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Penandatangan yang Sah
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Tersedia ITC Bersih (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Buat Biaya
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
@@ -5139,6 +5159,7 @@
 DocType: Quiz Result,Wrong,Salah
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tingkat di mana mata uang Daftar Harga dikonversi ke mata uang dasar pelanggan
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Jumlah Bersih (Perusahaan Mata Uang)
+DocType: Sales Partner,Referral Code,Kode Rujukan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Jumlah uang muka tidak boleh lebih besar dari jumlah sanksi
 DocType: Salary Slip,Hour Rate,Nilai per Jam
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Aktifkan Pemesanan Ulang Otomatis
@@ -5267,6 +5288,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Tampilkan Kuantitas Saham
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Kas Bersih dari Operasi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Baris # {0}: Status harus {1} untuk Diskon Faktur {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Item 4
 DocType: Student Admission,Admission End Date,Pendaftaran Tanggal Akhir
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Sub-kontraktor
@@ -5289,6 +5311,7 @@
 DocType: Travel Request,Fully Sponsored,Sepenuhnya Disponsori
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Masuk Balik Jurnal
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Buat Kartu Pekerjaan
+DocType: Quotation,Referral Sales Partner,Rujukan Mitra Penjualan
 DocType: Quality Procedure Process,Process Description,Deskripsi proses
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Pelanggan {0} dibuat
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Saat ini tidak ada persediaan di gudang manapun
@@ -5423,6 +5446,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Tingkat BOM
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Membaca File yang Diunggah
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Pesanan Kerja yang Berhenti tidak dapat dibatalkan, Hapus terlebih dahulu untuk membatalkan"
+DocType: Coupon Code,Coupon Code,Kode Kupon
 DocType: Asset,Journal Entry for Scrap,Jurnal masuk untuk Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Silakan tarik item dari Pengiriman Note
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Baris {0}: pilih workstation terhadap operasi {1}
@@ -5505,6 +5529,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Tanggal&#39; diperlukan
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Data Impor dan Ekspor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Maaf, validitas kode kupon telah kedaluwarsa"
 DocType: Bank Account,Account Details,Rincian Account
 DocType: Crop,Materials Required,Bahan yang dibutuhkan
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Tidak ada siswa Ditemukan
@@ -5542,6 +5567,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Buka Pengguna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Jumlah yang dibayarkan + Write Off Jumlah tidak bisa lebih besar dari Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} tidak Nomor Batch berlaku untuk Stok Barang {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Silakan masukkan kode kupon yang valid !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Catatan: Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Task,Task Description,Deskripsi Tugas
 DocType: Training Event,Seminar,Seminar
@@ -5805,6 +5831,7 @@
 ,TDS Payable Monthly,TDS Hutang Bulanan
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Antri untuk mengganti BOM. Mungkin perlu beberapa menit.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Total Pembayaran
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Nomor Seri Diperlukan untuk Barang Bernomor Seri {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
@@ -5894,6 +5921,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Dapatkan Bahan Baku untuk Produksi
 DocType: Job Opening,Job Title,Jabatan
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Ref Pembayaran di Masa Depan
+DocType: Quotation,Additional Discount and Coupon Code,Diskon Tambahan dan Kode Kupon
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} menunjukkan bahwa {1} tidak akan memberikan kutipan, namun semua item \ telah dikutip. Memperbarui status kutipan RFQ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Sampel Maksimum - {0} telah disimpan untuk Batch {1} dan Item {2} di Batch {3}.
@@ -6121,7 +6149,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Pengaturan untuk homepage website
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} ditahan sampai {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ tidak diizinkan untuk {0} karena kartu skor berdiri dari {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Membuat Purchase Invoice
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Cuti Yang Telah Digunakan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} Kupon yang digunakan adalah {1}. Kuantitas yang diizinkan habis
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Apakah Anda ingin mengirimkan permintaan materi
 DocType: Job Offer,Awaiting Response,Menunggu Respon
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6135,6 +6165,7 @@
 DocType: Training Event Employee,Optional,Pilihan
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisis air
+DocType: Sales Order,Skip Delivery Note,Lewati Catatan Pengiriman
 DocType: Price List,Price Not UOM Dependent,Harga Tidak Tergantung UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} varian dibuat.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Perjanjian Tingkat Layanan Default sudah ada.
@@ -6239,6 +6270,7 @@
 DocType: Vehicle,Last Carbon Check,Terakhir Carbon Periksa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Beban Legal
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Silakan pilih kuantitas pada baris
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Perintah Kerja {0}: kartu kerja tidak ditemukan untuk operasi {1}
 DocType: Purchase Invoice,Posting Time,Posting Waktu
 DocType: Timesheet,% Amount Billed,% Jumlah Ditagih
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Beban Telepon
@@ -6341,7 +6373,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tersedia-untuk-digunakan Tanggal
 ,Sales Funnel,Penjualan Saluran
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Troli
@@ -6436,6 +6467,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Poin Loyalitas akan dihitung dari pengeluaran yang dilakukan (melalui Faktur Penjualan), berdasarkan faktor penagihan yang disebutkan."
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
+DocType: Pricing Rule,Coupon Code Based,Berbasis Kode Kupon
 DocType: Company,HRA Settings,Pengaturan HRA
 DocType: Homepage,Hero Section,Bagian Pahlawan
 DocType: Employee Transfer,Transfer Date,Tanggal Transfer
@@ -6551,6 +6583,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Harap tentukan filter Perusahaan jika Group By &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Posting Tanggal tidak bisa tanggal di masa depan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} tidak sesuai dengan {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Stock Entry,Target Warehouse Address,Target Gudang Alamat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Santai Cuti
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Waktu sebelum shift dimulai saat di mana Karyawan Masuk dianggap hadir.
@@ -6585,7 +6618,6 @@
 DocType: Employee Grade,Employee Grade,Kelas Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
 DocType: GSTR 3B Report,June,Juni
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Share Balance,From No,Dari No
 DocType: Shift Type,Early Exit Grace Period,Periode Grace Keluar Awal
 DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
@@ -6870,7 +6902,6 @@
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Entrikan Menyetujui Peran atau Menyetujui Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Perjanjian Tingkat Layanan dengan Jenis Entitas {0} dan Entitas {1} sudah ada.
 DocType: Journal Entry,Write Off Entry,Menulis Off Entri
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
@@ -7008,6 +7039,7 @@
 DocType: Budget,Warn,Peringatan: Cuti aplikasi berisi tanggal blok berikut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Semua item telah ditransfer untuk Perintah Kerja ini.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
+DocType: Bank Account,Company Account,Akun Perusahaan
 DocType: Asset Maintenance,Manufacturing User,Manufaktur Pengguna
 DocType: Purchase Invoice,Raw Materials Supplied,Bahan Baku Disupply
 DocType: Subscription Plan,Payment Plan,Rencana pembayaran
@@ -7049,6 +7081,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) tidak boleh lebih besar dari kuantitas yang direncanakan ({2}) dalam Perintah Kerja {3}
 DocType: Certification Application,Name of Applicant,Nama Pemohon
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Waktu Lembar untuk manufaktur.
+DocType: Quick Stock Balance,Quick Stock Balance,Saldo Stok Cepat
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Subtotal
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Tidak dapat mengubah properti Varian setelah transaksi saham. Anda harus membuat Item baru untuk melakukan ini.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA Mandate
@@ -7375,6 +7408,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Silakan set {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} adalah siswa tidak aktif
 DocType: Employee,Health Details,Detail Kesehatan
+DocType: Coupon Code,Coupon Type,Jenis Kupon
 DocType: Leave Encashment,Encashable days,Hari-hari yang bisa dikompresi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Untuk membuat dokumen referensi Request Request diperlukan
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7658,6 +7692,7 @@
 DocType: Hotel Room Package,Amenities,Fasilitas
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Ambil Ketentuan Pembayaran secara otomatis
 DocType: QuickBooks Migrator,Undeposited Funds Account,Rekening Dana yang Belum Ditentukan
+DocType: Coupon Code,Uses,Penggunaan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Beberapa modus pembayaran default tidak diperbolehkan
 DocType: Sales Invoice,Loyalty Points Redemption,Penebusan Poin Loyalitas
 ,Appointment Analytics,Penunjukan Analytics
@@ -7674,6 +7709,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Total Anggaran
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Biarkan kosong jika Anda membuat kelompok siswa per tahun
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Jika dicentang, total ada. dari Hari Kerja akan mencakup libur, dan ini akan mengurangi nilai Gaji Per Hari"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Gagal menambahkan Domain
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Untuk memungkinkan penerimaan / pengiriman berlebih, perbarui &quot;Penerimaan Lebih / Tunjangan Pengiriman&quot; di Pengaturan Stok atau Item."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Aplikasi yang menggunakan kunci saat ini tidak dapat diakses, apakah Anda yakin?"
 DocType: Subscription Settings,Prorate,Prorata
@@ -7686,6 +7722,7 @@
 ,BOM Stock Report,Laporan Persediaan BOM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Jika tidak ada slot waktu yang ditetapkan, maka komunikasi akan ditangani oleh grup ini"
 DocType: Stock Reconciliation Item,Quantity Difference,Perbedaan Kuantitas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Opportunity Item,Basic Rate,Tarif Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 ,Electronic Invoice Register,Daftar Faktur Elektronik
@@ -7939,6 +7976,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Pajak dan Biaya Dikurangi (Perusahaan Mata Uang)
 DocType: Item Group,General Settings,Pengaturan Umum
 DocType: Article,Article,Artikel
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Silakan masukkan kode kupon !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Dari Mata dan Mata Uang Untuk tidak bisa sama
 DocType: Taxable Salary Slab,Percent Deduction,Pengurangan Persen
 DocType: GL Entry,To Rename,Untuk Mengganti Nama
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index e2ce118..5e13baf 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,viðskiptavinur samband við
 DocType: Shift Type,Enable Auto Attendance,Virkja sjálfvirk mæting
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Vinsamlegast sláðu inn vöruhús og dagsetningu
 DocType: Lost Reason Detail,Opportunity Lost Reason,Tækifærið misst ástæða
 DocType: Patient Appointment,Check availability,Athuga framboð
 DocType: Retention Bonus,Bonus Payment Date,Bónus greiðsludagur
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Lokið vinnutilboð
 DocType: Support Settings,Forum Posts,Forum Posts
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",Verkefnið hefur verið unnið sem bakgrunnsstarf. Ef eitthvað er um vinnslu í bakgrunni mun kerfið bæta við athugasemd um villuna við þessa hlutafjársátt og fara aftur í drög að stigi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Því miður, gildistími afsláttarmiða hefur ekki byrjað"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Skattskyld fjárhæð
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Skildu eftir upplýsingum um stefnu
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,einnota
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,bekk
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Atriðakóði&gt; Vöruflokkur&gt; Vörumerki
 DocType: Restaurant Table,No of Seats,Nei sæti
 DocType: Sales Invoice,Overdue and Discounted,Forföll og afsláttur
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Hringt úr sambandi
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,Línubil fyrir fjárhæð í orðum
 DocType: Vehicle,Additional Details,Önnur Nánar
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Engin lýsing gefin
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Sæktu hluti úr vöruhúsinu
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Beiðni um kaupin.
 DocType: POS Closing Voucher Details,Collected Amount,Söfnuður upphæð
 DocType: Lab Test,Submitted Date,Sendingardagur
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Frekari
 ,Trial Balance (Simple),Reynslujafnvægi (einfalt)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Virkja frestaðan kostnað
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Beitt afsláttarmiða kóða
 DocType: Asset,Next Depreciation Date,Næsta Afskriftir Dagsetning
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Virkni Kostnaður á hvern starfsmann
 DocType: Accounts Settings,Settings for Accounts,Stillingar fyrir reikninga
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Vinna fyrirmæli
 DocType: Sales Invoice,Total Qty,Total Magn
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Netfang
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 DocType: Item,Show in Website (Variant),Sýna í Website (Variant)
 DocType: Employee,Health Concerns,Heilsa Áhyggjuefni
 DocType: Payroll Entry,Select Payroll Period,Veldu Launaskrá Tímabil
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Skattgreiðslureikningur
 DocType: Pricing Rule,Sales Partner,velta Partner
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Allir birgir skorar.
+DocType: Coupon Code,To be used to get discount,Til að nota til að fá afslátt
 DocType: Buying Settings,Purchase Receipt Required,Kvittun Áskilið
 DocType: Sales Invoice,Rail,Járnbraut
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Raunverulegur kostnaður
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Framleiðsluáætlun
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Opna reikningsskilatól
 DocType: Salary Component,Round to the Nearest Integer,Hringið að næsta heiltölu
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Leyfa að hlutum sem ekki eru til á lager sé bætt í körfuna
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,velta Return
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Setja magn í viðskiptum sem byggjast á raðnúmeri inntak
 ,Total Stock Summary,Samtals yfirlit yfir lager
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company Gjaldmiðill)
 ,Qty To Be Billed,Magn sem þarf að greiða
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Skilað Upphæð
+DocType: Coupon Code,Gift Card,Gjafakort
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Frátekið magn til framleiðslu: Magn hráefna til að framleiða hluti.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Innlausnardagur
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Þessi bankaviðskipti eru nú þegar að fullu sátt
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Búðu til tímarit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
 DocType: Account,Expenses Included In Valuation,Kostnaður í Verðmat
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Kaupið innheimtuseðla
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Þú getur aðeins endurnýjað ef aðild þín rennur út innan 30 daga
 DocType: Shopping Cart Settings,Show Stock Availability,Sýna framboð á lager
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Setjið {0} í eignaflokki {1} eða fyrirtæki {2}
@@ -1555,7 +1562,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Frátekið magn: Magn pantað til sölu, en ekki afhent."
 DocType: Drug Prescription,Interval UOM,Interval UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Veldu aftur, ef valið heimilisfang er breytt eftir að vista"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Frátekið magn fyrir undirverktaka: Magn hráefna til að búa til undirverktaka hluti.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Frátekið magn fyrir undirverktaka: Magn hráefna til að búa til undirverktaka hluti.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
 DocType: Item,Hub Publishing Details,Hub Publishing Upplýsingar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Opening&#39;
@@ -1818,6 +1825,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Flytur inn hluti og UOM
 DocType: Repayment Schedule,Balance Loan Amount,Balance lánsfjárhæð
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Bætt við smáatriði
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Því miður, afsláttarmiða kóða er búinn"
 DocType: Communication Medium,Catch All,Afli allra
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Dagskrá Námskeið
 DocType: Budget,Applicable on Material Request,Gildir á efnisbeiðni
@@ -1985,6 +1993,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ógilt Attribute
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} Leggja skal fram
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Netfang herferðir
+DocType: Sales Partner,To Track inbound purchase,Til að fylgjast með innkaupum á heimleið
 DocType: Buying Settings,Default Supplier Group,Sjálfgefið Birgir Group
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},Hámarksupphæð sem hæfur er fyrir hluti {0} fer yfir {1}
@@ -2140,8 +2149,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Gerðu hlutabréfafærslu
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Stilla stöðu
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Uppfyllingardagur
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Nálægt þér
 DocType: Student,O-,O-
@@ -2265,6 +2274,7 @@
 DocType: Quality Meeting Table,Under Review,Til athugunar
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Mistókst að skrá þig inn
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Eignin {0} búin til
+DocType: Coupon Code,Promotional,Kynningar
 DocType: Special Test Items,Special Test Items,Sérstakar prófanir
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Þú þarft að vera notandi með kerfisstjóra og hlutverkastjóra hlutverk til að skrá þig á markaðssvæðinu.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Lykilskýrslur
@@ -2302,6 +2312,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Doc Tegund
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
 DocType: Subscription Plan,Billing Interval Count,Greiðslumiðlunartala
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Tilnefningar og þolinmæði
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Gildi vantar
 DocType: Employee,Department and Grade,Deild og bekk
@@ -2404,6 +2416,7 @@
 DocType: Project,Start and End Dates,Upphafs- og lokadagsetningar
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Samningsskilmál Skilgreining Skilmálar
 ,Delivered Items To Be Billed,Afhent Items verður innheimt
+DocType: Coupon Code,Maximum Use,Hámarksnotkun
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Warehouse er ekki hægt að breyta fyrir Raðnúmer
 DocType: Authorization Rule,Average Discount,Meðal Afsláttur
@@ -2565,6 +2578,7 @@
 DocType: Item,Inventory,Skrá
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Sæktu sem Json
 DocType: Item,Sales Details,velta Upplýsingar
+DocType: Coupon Code,Used,Notað
 DocType: Opportunity,With Items,með atriði
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Herferðin &#39;{0}&#39; er þegar til fyrir {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,Viðhaldsteymi
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",Engin virk BOM fannst fyrir hlut {0}. Ekki er hægt að tryggja afhendingu með \ raðnúmeri
 DocType: Sales Partner,Sales Partner Target,Velta Partner Target
 DocType: Loan Type,Maximum Loan Amount,Hámarkslán
-DocType: Pricing Rule,Pricing Rule,verðlagning Regla
+DocType: Coupon Code,Pricing Rule,verðlagning Regla
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Afrita rúlla númer fyrir nemanda {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Efni Beiðni um Innkaupapöntun
 DocType: Company,Default Selling Terms,Sjálfgefin söluskilmálar
@@ -2773,6 +2787,7 @@
 DocType: Payment Schedule,Payment Amount,Greiðslu upphæð
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Hálft dagur Dagsetning ætti að vera á milli vinnu frá dagsetningu og vinnslutíma
 DocType: Healthcare Settings,Healthcare Service Items,Heilbrigðisþjónustudeildir
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Ógild strikamerki. Það er enginn hlutur festur við þennan strikamerki.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,neytt Upphæð
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Net Breyting á Cash
 DocType: Assessment Plan,Grading Scale,flokkun Scale
@@ -2892,7 +2907,6 @@
 DocType: Share Transfer,Asset Account,Eignareikningur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nýr útgáfudagur ætti að vera í framtíðinni
 DocType: Purchase Invoice,End date of current invoice's period,Lokadagur tímabils núverandi reikningi er
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauði&gt; HR stillingar
 DocType: Lab Test,Technician Name,Nafn tæknimanns
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3003,6 +3017,7 @@
 DocType: Products Settings,Hide Variants,Fela afbrigði
 DocType: Lead,Next Contact By,Næsta Samband með
 DocType: Compensatory Leave Request,Compensatory Leave Request,Bótaábyrgð
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Ekki hægt að of mikið af hlut {0} í röð {1} meira en {2}. Til að leyfa ofinnheimtu, vinsamlegast stilltu vasapeninga í reikningum"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Magn krafist fyrir lið {0} í röð {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Warehouse {0} Ekki er hægt að eyða eins magn er fyrir hendi tl {1}
 DocType: Blanket Order,Order Type,Order Type
@@ -3172,7 +3187,6 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
 DocType: Employee Benefit Claim,Claim Benefit For,Kröfuhagur fyrir
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",Ekki er hægt að yfirfæra fyrir lið {0} í röð {1} meira en {2}. Til að leyfa ofgreiðslu skaltu setja í lagerstillingar
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Uppfæra svar
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3462,6 +3476,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Vinsamlegast tilgreinið gjaldmiðil í félaginu
 DocType: Workstation,Wages per hour,Laun á klukkustund
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Stilla {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; viðskiptavinahópur&gt; landsvæði
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Stock jafnvægi í Batch {0} verður neikvætt {1} fyrir lið {2} í Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Eftirfarandi efni beiðnir hafa verið hækkaðir sjálfvirkt miðað aftur röð stigi atriðisins
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
@@ -3791,6 +3806,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Senda Laun Slip
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Á bið
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Efni þarf að hafa að minnsta kosti einn réttan valkost
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Kaup pantanir
 DocType: Account,Inter Company Account,Innri félagsreikningur
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Innflutningur á lausu
 DocType: Sales Partner,Address & Contacts,Heimilisfang og Tengiliðir
@@ -3801,6 +3817,7 @@
 DocType: POS Profile,[Select],[Veldu]
 DocType: Staffing Plan Detail,Number Of Positions,Fjöldi staða
 DocType: Vital Signs,Blood Pressure (diastolic),Blóðþrýstingur (diastolic)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Vinsamlegast veldu viðskiptavininn.
 DocType: SMS Log,Sent To,send til
 DocType: Agriculture Task,Holiday Management,Holiday Management
 DocType: Payment Request,Make Sales Invoice,Gera sölureikning
@@ -4010,7 +4027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} er ekki lögð
 DocType: Subscription,Trialling,Skrímsli
 DocType: Sales Invoice Item,Deferred Revenue,Frestað tekjur
-DocType: Bank Account,GL Account,GL reikningur
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Cash reikningur verður notaður fyrir stofnun sölureikninga
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Undanþága undirflokkur
 DocType: Member,Membership Expiry Date,Félagsdagur
@@ -4414,13 +4430,13 @@
 DocType: C-Form Invoice Detail,Territory,Territory
 DocType: Pricing Rule,Apply Rule On Item Code,Notaðu reglu um hlutakóða
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Vinsamlegast nefna engin heimsókna krafist
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Hlutabréfaskýrsla
 DocType: Stock Settings,Default Valuation Method,Sjálfgefið Verðmatsaðferð
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Gjald
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Sýna uppsöfnuð upphæð
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Uppfærsla í gangi. Það gæti tekið smá stund.
 DocType: Production Plan Item,Produced Qty,Framleitt magn
 DocType: Vehicle Log,Fuel Qty,eldsneyti Magn
-DocType: Stock Entry,Target Warehouse Name,Markmið Vörugeymsla
 DocType: Work Order Operation,Planned Start Time,Planned Start Time
 DocType: Course,Assessment,mat
 DocType: Payment Entry Reference,Allocated,úthlutað
@@ -4486,10 +4502,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Staðlaðar Skilmálar og skilyrði sem hægt er að bæta við sölu og innkaup. Dæmi: 1. Gildi tilboðinu. 1. Greiðsluskilmálar (fyrirfram, á lánsfé, hluti fyrirfram etc). 1. Hvað er aukinn (eða ber að greiða viðskiptamanni). 1. Öryggi / notkun viðvörun. 1. Ábyrgð ef einhver er. 1. Skilareglur. 1. Skilmálar skipum, ef við á. 1. Leiðir sem fjallað deilur bætur, ábyrgð osfrv 1. Heimilisfang og Hafa fyrirtækisins."
 DocType: Homepage Section,Section Based On,Kafli byggður á
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Sýna Nota afsláttarmiða kóða
 DocType: Issue,Issue Type,Útgáfustegund
 DocType: Attendance,Leave Type,Leave Type
 DocType: Purchase Invoice,Supplier Invoice Details,Birgir Reikningsyfirlit
 DocType: Agriculture Task,Ignore holidays,Hunsa frí
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Bæta við / breyta skilyrðum afsláttarmiða
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Kostnað / Mismunur reikning ({0}) verður að vera &#39;rekstrarreikning &quot;reikning a
 DocType: Stock Entry Detail,Stock Entry Child,Barnahlutabréf
 DocType: Project,Copied From,Afritað frá
@@ -4664,6 +4682,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Mat Plan Viðmið
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Viðskipti
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Hindra innkaupapantanir
+DocType: Coupon Code,Coupon Name,Afsláttarmiðaheiti
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Viðkvæm
 DocType: Email Campaign,Scheduled,áætlunarferðir
 DocType: Shift Type,Working Hours Calculation Based On,Útreikningur vinnutíma byggður á
@@ -4680,7 +4699,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Búðu til afbrigði
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Verðlisti Gjaldmiðill ekki valinn
+DocType: Quick Stock Balance,Available Quantity,Lauslegt magn
 DocType: Purchase Invoice,Availed ITC Cess,Notaði ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi fyrir kennara í menntun&gt; Menntunarstillingar
 ,Student Monthly Attendance Sheet,Student Monthly Aðsókn Sheet
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Sendingarregla gildir aðeins um sölu
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Afskriftir Róður {0}: Næsta Afskriftir Dagsetning getur ekki verið fyrir Innkaupardagur
@@ -4747,8 +4768,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
 DocType: Quality Meeting,Quality Meeting,Gæðafundur
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group til Group
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext User
+DocType: Coupon Code,Coupon Description,Afsláttarmiða lýsing
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Hópur er nauðsynlegur í röð {0}
 DocType: Company,Default Buying Terms,Sjálfgefnir kaupsskilmálar
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Kvittun Item Staðar
@@ -4911,6 +4932,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Gegn Document Detail No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Eyðing er ekki leyfð fyrir land {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Party Type er nauðsynlegur
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Notaðu afsláttarmiða kóða
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",Að því er varðar starfskort {0} geturðu aðeins slegið inn „Efnisflutning til framleiðslu“
 DocType: Quality Inspection,Outgoing,Outgoing
 DocType: Customer Feedback Table,Customer Feedback Table,Viðbrögð töflu viðskiptavina
@@ -5060,7 +5082,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Við afhendingu innkaupapöntunar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Bæta við öllum birgjum
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Úthlutað Magn má ekki vera hærra en útistandandi upphæð.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; viðskiptavinahópur&gt; landsvæði
 DocType: Tally Migration,Parties,Teiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Fletta BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Veðlán
@@ -5092,7 +5113,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ekki leyfa að setja aðra hluti fyrir hlutinn {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dagsetning er endurtekin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Leyft Undirritaður
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi fyrir kennara í menntun&gt; Menntunarstillingar
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC í boði (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Búðu til gjöld
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Kaup Kostnaður (í gegnum kaupa Reikningar)
@@ -5117,6 +5137,7 @@
 DocType: Quiz Result,Wrong,Rangt
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Gengi sem Verðskrá mynt er breytt í grunngj.miðil viðskiptavinarins
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Net Magn (Company Gjaldmiðill)
+DocType: Sales Partner,Referral Code,Tilvísunarkóði
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Heildarfjöldi fyrirframgreiðslna má ekki vera hærri en heildarfjárhæðir
 DocType: Salary Slip,Hour Rate,Hour Rate
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Virkja sjálfvirka endurpöntun
@@ -5245,6 +5266,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Sýna lager Magn
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Handbært fé frá rekstri
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Röð # {0}: Staðan verður að vera {1} til að fá reikningaafslátt {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Liður 4
 DocType: Student Admission,Admission End Date,Aðgangseyrir Lokadagur
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Sub-samningagerð
@@ -5267,6 +5289,7 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Reverse Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Búðu til atvinnukort
+DocType: Quotation,Referral Sales Partner,Tilvísun söluaðila
 DocType: Quality Procedure Process,Process Description,Aðferðalýsing
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Viðskiptavinur {0} er búinn til.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Eins og er ekki birgðir í boði á hvaða vöruhúsi
@@ -5401,6 +5424,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Lestur hlaðið skrá
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",Stöðvuð vinnuskilyrði er ekki hægt að hætta við. Stöðva það fyrst til að hætta við
+DocType: Coupon Code,Coupon Code,afsláttarkóði
 DocType: Asset,Journal Entry for Scrap,Journal Entry fyrir rusl
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Vinsamlegast draga atriði úr afhendingarseðlinum
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Rú {0}: veldu vinnustöðina gegn aðgerðinni {1}
@@ -5483,6 +5507,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,„Dagsetning“ er krafist
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Gögn Innflutningur og útflutningur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Því miður, gildistími afsláttarmiða er útrunninn"
 DocType: Bank Account,Account Details,Reikningsupplýsingar
 DocType: Crop,Materials Required,Efni sem krafist er
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Engar nemendur Found
@@ -5520,6 +5545,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Fara til notenda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Greiddur upphæð + afskrifa Upphæð má ekki vera meiri en Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} er ekki gild Batch Símanúmer fyrir lið {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Vinsamlegast sláðu inn gildan afsláttarmiða kóða !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Athugið: Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Task,Task Description,Verkefnalýsing
 DocType: Training Event,Seminar,Seminar
@@ -5783,6 +5809,7 @@
 ,TDS Payable Monthly,TDS greiðanleg mánaðarlega
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Í biðstöðu fyrir að skipta um BOM. Það getur tekið nokkrar mínútur.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Verðmat og heildar&#39;
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauð&gt; HR stillingar
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Heildargreiðslur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial Nos Áskilið fyrir serialized lið {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Passa Greiðslur með Reikningar
@@ -5872,6 +5899,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Fáðu hráefni til framleiðslu
 DocType: Job Opening,Job Title,Starfsheiti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Framtíðargreiðsla ref
+DocType: Quotation,Additional Discount and Coupon Code,Viðbótarafsláttur og afsláttarmiða kóða
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0} gefur til kynna að {1} muni ekki gefa til kynna en allir hlutir \ hafa verið vitnar í. Uppfæra RFQ vitna stöðu.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Hámarksýni - {0} hafa þegar verið haldið fyrir lotu {1} og lið {2} í lotu {3}.
@@ -6099,7 +6127,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Stillingar fyrir heimasíðu heimasíðuna
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} er í bið til {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs eru ekki leyfð fyrir {0} vegna þess að stigatafla sem stendur fyrir {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Gerðu innkaupareikning
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Notaðar blöð
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} afsláttarmiða notaður er {1}. Leyfilegt magn er uppurið
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Viltu leggja fram efnisbeiðnina
 DocType: Job Offer,Awaiting Response,bíður svars
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6113,6 +6143,7 @@
 DocType: Training Event Employee,Optional,Valfrjálst
 DocType: Salary Slip,Earning & Deduction,Launin &amp; Frádráttur
 DocType: Agriculture Analysis Criteria,Water Analysis,Vatnsgreining
+DocType: Sales Order,Skip Delivery Note,Sleppa afhendingu athugasemd
 DocType: Price List,Price Not UOM Dependent,Verð ekki UOM háður
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} afbrigði búin til.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Sjálfgefinn þjónustustigssamningur er þegar til.
@@ -6217,6 +6248,7 @@
 DocType: Vehicle,Last Carbon Check,Síðasta Carbon Athuga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,málskostnaðar
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Vinsamlegast veljið magn í röð
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Vinnipöntun {0}: starfskort fannst ekki fyrir aðgerðina {1}
 DocType: Purchase Invoice,Posting Time,staða Time
 DocType: Timesheet,% Amount Billed,% Magn Billed
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Sími Útgjöld
@@ -6319,7 +6351,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skattar og gjöld bætt
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskriftir Rauða {0}: Næsta Afskriftir Dagsetning má ekki vera fyrr en hægt er að nota Dagsetning
 ,Sales Funnel,velta trekt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Atriðakóði&gt; Vöruflokkur&gt; Vörumerki
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Körfu
@@ -6414,6 +6445,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Hollusta stig verður reiknað út frá því sem varið er (með sölureikningi), byggt á söfnunartölu sem getið er um."
 DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
+DocType: Pricing Rule,Coupon Code Based,Byggt á afsláttarmiða kóða
 DocType: Company,HRA Settings,HRA Stillingar
 DocType: Homepage,Hero Section,Hetja hluti
 DocType: Employee Transfer,Transfer Date,Flutnings Dagsetning
@@ -6529,6 +6561,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Vinsamlegast stilltu Fyrirtæki sía eyða ef Group By er &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Staða Dagsetning má ekki vera liðinn
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} passar ekki við {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 DocType: Stock Entry,Target Warehouse Address,Target Warehouse Heimilisfang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Kjóll Leave
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Tíminn fyrir upphafstíma vakta þar sem innritun starfsmanna er talin til mætingar.
@@ -6563,7 +6596,6 @@
 DocType: Employee Grade,Employee Grade,Starfsmaður
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ákvæðisvinnu
 DocType: GSTR 3B Report,June,Júní
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 DocType: Share Balance,From No,Frá nr
 DocType: Shift Type,Early Exit Grace Period,Náðartímabil snemma útgöngu
 DocType: Task,Actual Time (in Hours),Tíminn (í klst)
@@ -6848,7 +6880,6 @@
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Veldu Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vinsamlegast sláðu inn Samþykkir hlutverki eða samþykkir notandi
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Samningur um þjónustustig með einingategund {0} og eining {1} er þegar til.
 DocType: Journal Entry,Write Off Entry,Skrifaðu Off færslu
 DocType: BOM,Rate Of Materials Based On,Hlutfall af efni byggt á
@@ -6986,6 +7017,7 @@
 DocType: Budget,Warn,Warn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Öll atriði hafa nú þegar verið flutt fyrir þessa vinnuáætlun.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
+DocType: Bank Account,Company Account,Fyrirtækisreikningur
 DocType: Asset Maintenance,Manufacturing User,framleiðsla User
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Staðar
 DocType: Subscription Plan,Payment Plan,Greiðsluáætlun
@@ -7027,6 +7059,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) getur ekki verið meiri en áætlað magn ({2}) í vinnuskilyrðingu {3}
 DocType: Certification Application,Name of Applicant,Nafn umsækjanda
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Tími Sheet fyrir framleiðslu.
+DocType: Quick Stock Balance,Quick Stock Balance,Fljótur hlutafjárjöfnuður
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Samtals
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ekki er hægt að breyta Variant eignum eftir viðskipti með hlutabréf. Þú verður að búa til nýtt atriði til að gera þetta.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA umboð
@@ -7353,6 +7386,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Vinsamlegast settu {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} er óvirkur nemandi
 DocType: Employee,Health Details,Heilsa Upplýsingar
+DocType: Coupon Code,Coupon Type,Gerð afsláttarmiða
 DocType: Leave Encashment,Encashable days,Skemmtilegir dagar
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Til að búa til greiðslubeiðni þarf viðmiðunarskjal
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7635,6 +7669,7 @@
 DocType: Hotel Room Package,Amenities,Aðstaða
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Sæktu sjálfkrafa greiðsluskilmála
 DocType: QuickBooks Migrator,Undeposited Funds Account,Óheimilt sjóðsreikningur
+DocType: Coupon Code,Uses,Notar
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Margfeldi sjálfgefið greiðslumáti er ekki leyfilegt
 DocType: Sales Invoice,Loyalty Points Redemption,Hollusta stig Innlausn
 ,Appointment Analytics,Ráðstefna Analytics
@@ -7651,6 +7686,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Heildaráætlun
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Skildu eftir ef þú gerir nemendur hópa á ári
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ef hakað Total nr. vinnudaga mun fela frí, og þetta mun draga úr gildi af launum fyrir dag"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Mistókst að bæta við léninu
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Til að leyfa móttöku / afhendingu, skal uppfæra „Yfir móttöku / afhendingu“ í lager stillingum eða hlutnum."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Forrit sem nota núverandi lykil vilja ekki geta nálgast, ertu viss?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7663,6 +7699,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ef það er enginn úthlutaður tímaröð, þá mun samskipti fara með þennan hóp"
 DocType: Stock Reconciliation Item,Quantity Difference,magn Mismunur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Upphæð
 ,Electronic Invoice Register,Rafræn reikningaskrá
@@ -7916,6 +7953,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Skattar og gjöld FrÃ¡ (Company Gjaldmiðill)
 DocType: Item Group,General Settings,Almennar stillingar
 DocType: Article,Article,Grein
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Vinsamlegast sláðu inn afsláttarmiða kóða !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Frá Gjaldmiðill og gjaldmiðla getur ekki verið það sama
 DocType: Taxable Salary Slab,Percent Deduction,Hlutfall frádráttar
 DocType: GL Entry,To Rename,Að endurnefna
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index f4ff5ef..5d38b99 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Customer Contact
 DocType: Shift Type,Enable Auto Attendance,Abilita assistenza automatica
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Inserisci il magazzino e la data
 DocType: Lost Reason Detail,Opportunity Lost Reason,Opportunità persa motivo
 DocType: Patient Appointment,Check availability,Verificare la disponibilità
 DocType: Retention Bonus,Bonus Payment Date,Data di pagamento bonus
@@ -265,6 +266,7 @@
 ,Completed Work Orders,Ordini di lavoro completati
 DocType: Support Settings,Forum Posts,Messaggi del forum
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","L&#39;attività è stata accodata come processo in background. Nel caso in cui si verifichino problemi durante l&#39;elaborazione in background, il sistema aggiungerà un commento sull&#39;errore in questa Riconciliazione di magazzino e tornerà alla fase Bozza"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Siamo spiacenti, la validità del codice coupon non è iniziata"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Imponibile
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: Leave Policy,Leave Policy Details,Lasciare i dettagli della politica
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumabile
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Grado
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Restaurant Table,No of Seats,No delle sedute
 DocType: Sales Invoice,Overdue and Discounted,Scaduto e scontato
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Chiamata disconnessa
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,interlinea per importo in lettere
 DocType: Vehicle,Additional Details,Dettagli aggiuntivi
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,Nessuna descrizione fornita
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Recupera articoli dal magazzino
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,Richiesta di acquisto.
 DocType: POS Closing Voucher Details,Collected Amount,Importo raccolto
 DocType: Lab Test,Submitted Date,Data di invio
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Guide
 ,Trial Balance (Simple),Bilancio di verifica (semplice)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Abilita spese differite
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Codice coupon applicato
 DocType: Asset,Next Depreciation Date,Data ammortamento successivo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
@@ -848,8 +853,6 @@
 DocType: BOM,Work Order,Ordine di lavoro
 DocType: Sales Invoice,Total Qty,Totale Quantità
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Email ID Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 DocType: Item,Show in Website (Variant),Show di Sito web (Variant)
 DocType: Employee,Health Concerns,Preoccupazioni per la salute
 DocType: Payroll Entry,Select Payroll Period,Seleziona Periodo Busta Paga
@@ -1013,6 +1016,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Conto ritenuta d&#39;acconto
 DocType: Pricing Rule,Sales Partner,Partner vendite
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,Tutti i punteggi dei fornitori.
+DocType: Coupon Code,To be used to get discount,Per essere utilizzato per ottenere lo sconto
 DocType: Buying Settings,Purchase Receipt Required,Ricevuta di Acquisto necessaria
 DocType: Sales Invoice,Rail,Rotaia
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Costo attuale
@@ -1063,6 +1067,7 @@
 DocType: Production Plan,Production Plan,Piano di produzione
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Strumento di Creazione di Fattura Tardiva
 DocType: Salary Component,Round to the Nearest Integer,Arrotonda al numero intero più vicino
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Consenti agli articoli non disponibili di essere aggiunti al carrello
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Ritorno di vendite
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Imposta Qtà in Transazioni basate su Nessun input seriale
 ,Total Stock Summary,Sommario totale delle azioni
@@ -1192,6 +1197,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Società di valuta)
 ,Qty To Be Billed,Quantità da fatturare
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Importo Consegnato
+DocType: Coupon Code,Gift Card,Carta regalo
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qtà riservata per la produzione: quantità di materie prime per la produzione di articoli.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data di rimborso
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Questa transazione bancaria è già completamente riconciliata
@@ -1279,6 +1285,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Crea scheda attività
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valorizzazione
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Acquista fatture
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Puoi rinnovare solo se la tua iscrizione scade entro 30 giorni
 DocType: Shopping Cart Settings,Show Stock Availability,Mostra disponibilità di magazzino
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Imposta {0} nella categoria di asset {1} o nella società {2}
@@ -1574,7 +1581,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Riservato Quantità : quantità ordinata in vendita , ma non consegnati ."
 DocType: Drug Prescription,Interval UOM,Intervallo UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","Riseleziona, se l&#39;indirizzo scelto viene modificato dopo il salvataggio"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Qtà riservata per conto lavoro: quantità di materie prime per la produzione di articoli in conto lavoro.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qtà riservata per conto lavoro: quantità di materie prime per la produzione di articoli in conto lavoro.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 DocType: Item,Hub Publishing Details,Dettagli di pubblicazione Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening','Apertura'
@@ -1837,6 +1844,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Importazione di articoli e UOM
 DocType: Repayment Schedule,Balance Loan Amount,Importo del prestito di bilancio
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Aggiunto ai dettagli
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Siamo spiacenti, il codice coupon è esaurito"
 DocType: Communication Medium,Catch All,Prendi tutto
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Programma del corso
 DocType: Budget,Applicable on Material Request,Applicabile su richiesta materiale
@@ -2004,6 +2012,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,attributo non valido
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} deve essere confermato
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Campagne e-mail
+DocType: Sales Partner,To Track inbound purchase,Per tenere traccia dell&#39;acquisto in entrata
 DocType: Buying Settings,Default Supplier Group,Gruppo di fornitori predefinito
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},La quantità deve essere minore o uguale a {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},L&#39;importo massimo ammissibile per il componente {0} supera {1}
@@ -2159,8 +2168,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Effettuare una registrazione di magazzino
 DocType: Hotel Room Reservation,Hotel Reservation User,Utente prenotazione hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Imposta stato
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Si prega di selezionare il prefisso prima
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 DocType: Contract,Fulfilment Deadline,Scadenza di adempimento
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Vicino a te
 DocType: Student,O-,O-
@@ -2284,6 +2293,7 @@
 DocType: Quality Meeting Table,Under Review,In fase di revisione
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Impossibile accedere
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Asset {0} creato
+DocType: Coupon Code,Promotional,promozionale
 DocType: Special Test Items,Special Test Items,Articoli speciali di prova
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Devi essere un utente con i ruoli di System Manager e Item Manager da registrare sul Marketplace.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Rapporti chiave
@@ -2321,6 +2331,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,Tipo Doc
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
 DocType: Subscription Plan,Billing Interval Count,Conteggio intervalli di fatturazione
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,Appuntamenti e incontri con il paziente
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,Valore mancante
 DocType: Employee,Department and Grade,Dipartimento e grado
@@ -2423,6 +2435,7 @@
 DocType: Project,Start and End Dates,Date di inizio e fine
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Termini di adempimento del modello di contratto
 ,Delivered Items To Be Billed,Gli Articoli consegnati da Fatturare
+DocType: Coupon Code,Maximum Use,Massimo utilizzo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Apri la Distinta Base {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Magazzino non può essere modificato per Serial No.
 DocType: Authorization Rule,Average Discount,Sconto Medio
@@ -2585,6 +2598,7 @@
 DocType: Item,Inventory,Inventario
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Scarica come Json
 DocType: Item,Sales Details,Dettagli di vendita
+DocType: Coupon Code,Used,Usato
 DocType: Opportunity,With Items,Con gli articoli
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',La campagna &quot;{0}&quot; esiste già per {1} &quot;{2}&quot;
 DocType: Asset Maintenance,Maintenance Team,Squadra di manutenzione
@@ -2714,7 +2728,7 @@
 						Serial No cannot be ensured",Nessun BOM attivo trovato per l&#39;articolo {0}. La consegna per \ Numero di serie non può essere garantita
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 DocType: Loan Type,Maximum Loan Amount,Importo massimo del prestito
-DocType: Pricing Rule,Pricing Rule,Regola Prezzi
+DocType: Coupon Code,Pricing Rule,Regola Prezzi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},Duplica il numero di rotolo per lo studente {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 DocType: Company,Default Selling Terms,Termini di vendita predefiniti
@@ -2793,6 +2807,7 @@
 DocType: Payment Schedule,Payment Amount,Pagamento Importo
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,La data di mezza giornata deve essere compresa tra la data di fine lavoro e la data di fine lavoro
 DocType: Healthcare Settings,Healthcare Service Items,Articoli per servizi sanitari
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Codice a barre non valido. Non ci sono articoli collegati a questo codice a barre.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Assessment Plan,Grading Scale,Scala di classificazione
@@ -2912,7 +2927,6 @@
 DocType: Share Transfer,Asset Account,Conto cespiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nuova data di uscita dovrebbe essere in futuro
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di impostare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 DocType: Lab Test,Technician Name,Nome tecnico
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3023,6 +3037,7 @@
 DocType: Products Settings,Hide Variants,Nascondi varianti
 DocType: Lead,Next Contact By,Contatto Successivo Con
 DocType: Compensatory Leave Request,Compensatory Leave Request,Richiesta di congedo compensativo
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings","Impossibile eseguire l&#39;overbilling per l&#39;articolo {0} nella riga {1} più di {2}. Per consentire l&#39;eccessiva fatturazione, imposta l&#39;indennità in Impostazioni account"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},Quantità necessaria per la voce {0} in riga {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},Magazzino {0} non può essere cancellato in quanto esiste la quantità per l' articolo {1}
 DocType: Blanket Order,Order Type,Tipo di ordine
@@ -3192,7 +3207,6 @@
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
 DocType: Employee Benefit Claim,Claim Benefit For,Reclamo Beneficio per
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Impossibile eseguire lo overbill per l&#39;articolo {0} nella riga {1} più di {2}. Per consentire la fatturazione eccessiva, si prega di impostare in Impostazioni di magazzino"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Aggiorna risposta
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3483,6 +3497,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Si prega di specificare la valuta in azienda
 DocType: Workstation,Wages per hour,Salari all'ora
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Configura {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Equilibrio Stock in Lotto {0} sarà negativo {1} per la voce {2} a Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
@@ -3812,6 +3827,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Presenta Busta Paga
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,In attesa
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Una qustion deve avere almeno un&#39;opzione corretta
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Ordini di acquisto
 DocType: Account,Inter Company Account,Conto Inter Inter
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Importazione Collettiva
 DocType: Sales Partner,Address & Contacts,Indirizzi & Contatti
@@ -3822,6 +3838,7 @@
 DocType: POS Profile,[Select],[Seleziona]
 DocType: Staffing Plan Detail,Number Of Positions,Numero di posizioni
 DocType: Vital Signs,Blood Pressure (diastolic),Pressione sanguigna (diastolica)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Seleziona il cliente
 DocType: SMS Log,Sent To,Inviato A
 DocType: Agriculture Task,Holiday Management,Gestione Ferie
 DocType: Payment Request,Make Sales Invoice,Crea Fattura di vendita
@@ -4031,7 +4048,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} non è confermato
 DocType: Subscription,Trialling,sperimentazione
 DocType: Sales Invoice Item,Deferred Revenue,Ricavo differito
-DocType: Bank Account,GL Account,Conto GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Conto in contanti verrà utilizzato per la creazione di fattura di vendita
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Sottocategoria di esenzione
 DocType: Member,Membership Expiry Date,Data di scadenza dell&#39;appartenenza
@@ -4455,13 +4471,13 @@
 DocType: C-Form Invoice Detail,Territory,Territorio
 DocType: Pricing Rule,Apply Rule On Item Code,Applica regola sul codice articolo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Rapporto sul bilancio azionario
 DocType: Stock Settings,Default Valuation Method,Metodo di valorizzazione predefinito
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,tassa
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Mostra quantità cumulativa
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aggiornamento in corso. Potrebbe volerci un po &#39;.
 DocType: Production Plan Item,Produced Qty,Qtà prodotta
 DocType: Vehicle Log,Fuel Qty,Quantità di carburante
-DocType: Stock Entry,Target Warehouse Name,Nome del magazzino di destinazione
 DocType: Work Order Operation,Planned Start Time,Ora di inizio prevista
 DocType: Course,Assessment,Valutazione
 DocType: Payment Entry Reference,Allocated,Assegnati
@@ -4539,10 +4555,12 @@
  1. Modi di controversie indirizzamento, indennità, responsabilità, ecc 
  1. Indirizzo e contatti della vostra azienda."
 DocType: Homepage Section,Section Based On,Sezione basata su
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Mostra Applica codice coupon
 DocType: Issue,Issue Type,Tipo di Problema
 DocType: Attendance,Leave Type,Tipo di Permesso
 DocType: Purchase Invoice,Supplier Invoice Details,Dettagli Fattura Fornitore
 DocType: Agriculture Task,Ignore holidays,Ignora le vacanze
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Aggiungi / Modifica condizioni coupon
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 DocType: Stock Entry Detail,Stock Entry Child,Stock di entrata figlio
 DocType: Project,Copied From,Copiato da
@@ -4717,6 +4735,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criteri piano di valutazione
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Le transazioni
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Impedire gli ordini di acquisto
+DocType: Coupon Code,Coupon Name,Nome del coupon
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,suscettibile
 DocType: Email Campaign,Scheduled,Pianificate
 DocType: Shift Type,Working Hours Calculation Based On,Calcolo dell&#39;orario di lavoro basato su
@@ -4733,7 +4752,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Crea Varianti
 DocType: Vehicle,Diesel,diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,Listino Prezzi Valuta non selezionati
+DocType: Quick Stock Balance,Available Quantity,quantità disponibile
 DocType: Purchase Invoice,Availed ITC Cess,Disponibile ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 ,Student Monthly Attendance Sheet,Presenze mensile Scheda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Regola di spedizione applicabile solo per la vendita
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Riga di ammortamento {0}: la successiva data di ammortamento non può essere anteriore alla data di acquisto
@@ -4800,8 +4821,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
 DocType: Quality Meeting,Quality Meeting,Riunione di qualità
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-gruppo a gruppo
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext Utente
+DocType: Coupon Code,Coupon Description,Descrizione del coupon
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Il lotto è obbligatorio nella riga {0}
 DocType: Company,Default Buying Terms,Termini di acquisto predefiniti
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Ricevuta di Acquisto Articolo Fornito
@@ -4964,6 +4985,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Per Dettagli Documento N
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La cancellazione non è consentita per il Paese {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Tipo Partner è obbligatorio
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Applica il codice coupon
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry","Per la scheda lavoro {0}, è possibile effettuare solo l&#39;immissione di magazzino del tipo &quot;Trasferimento materiale per produzione&quot;"
 DocType: Quality Inspection,Outgoing,In partenza
 DocType: Customer Feedback Table,Customer Feedback Table,Tabella di feedback dei clienti
@@ -5113,7 +5135,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Alla presentazione dell&#39;ordine d&#39;acquisto
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Aggiungi tutti i fornitori
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Riga # {0}: L'Importo assegnato non può essere superiore all'importo dovuto.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 DocType: Tally Migration,Parties,parti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Sfoglia Distinta Base
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prestiti garantiti
@@ -5145,7 +5166,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Non consentire di impostare articoli alternativi per l&#39;articolo {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La Data si Ripete
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Firma autorizzata
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configura il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC disponibile (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crea tariffe
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
@@ -5170,6 +5190,7 @@
 DocType: Quiz Result,Wrong,Sbagliato
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Tasso al quale Listino valuta viene convertita in valuta di base del cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importo netto (Valuta Azienda)
+DocType: Sales Partner,Referral Code,Codice di riferimento
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,L&#39;importo totale anticipato non può essere maggiore dell&#39;importo sanzionato totale
 DocType: Salary Slip,Hour Rate,Rapporto Orario
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Abilita il riordino automatico
@@ -5298,6 +5319,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,Mostra quantità di magazzino
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,Cassa netto da attività
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},Riga # {0}: lo stato deve essere {1} per lo sconto fattura {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,Articolo 4
 DocType: Student Admission,Admission End Date,Data Fine Ammissione
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,Subappalto
@@ -5320,6 +5342,7 @@
 DocType: Travel Request,Fully Sponsored,Completamente sponsorizzato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Entrata di giornale inversa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Crea Job Card
+DocType: Quotation,Referral Sales Partner,Partner commerciale di riferimento
 DocType: Quality Procedure Process,Process Description,Descrizione del processo
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Cliente {0} creato.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Articolo attualmente non presente in nessun magazzino
@@ -5455,6 +5478,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Tasso
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Lettura del file caricato
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","L&#39;ordine di lavoro interrotto non può essere annullato, fermalo prima per annullare"
+DocType: Coupon Code,Coupon Code,codice coupon
 DocType: Asset,Journal Entry for Scrap,Diario di rottami
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Si prega di tirare oggetti da DDT
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Riga {0}: seleziona la workstation rispetto all&#39;operazione {1}
@@ -5537,6 +5561,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,È richiesta la &quot;data&quot;
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Importazione ed esportazione dati
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Siamo spiacenti, la validità del codice coupon è scaduta"
 DocType: Bank Account,Account Details,Dettagli Account
 DocType: Crop,Materials Required,Materiali richiesti
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,Nessun studenti hanno trovato
@@ -5574,6 +5599,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Vai agli Utenti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,Importo pagato + Importo svalutazione non può essere superiore a Totale generale
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} non è un numero di lotto valido per la voce {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Inserisci un codice coupon valido !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Nota : Non hai giorni sufficienti per il permesso {0}
 DocType: Task,Task Description,Descrizione del compito
 DocType: Training Event,Seminar,Seminario
@@ -5837,6 +5863,7 @@
 ,TDS Payable Monthly,TDS mensile pagabile
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,In coda per la sostituzione della BOM. Potrebbero essere necessari alcuni minuti.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di impostare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Pagamenti totali
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial Nos Obbligatorio per la voce Serialized {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Partita pagamenti con fatture
@@ -5926,6 +5953,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Ottieni materie prime per la produzione
 DocType: Job Opening,Job Title,Titolo Posizione
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Rif. Pagamento futuro
+DocType: Quotation,Additional Discount and Coupon Code,Codice sconto e coupon aggiuntivi
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} indica che {1} non fornirà una quotazione, ma tutti gli elementi \ sono stati quotati. Aggiornamento dello stato delle quotazione."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,Numero massimo di campioni: {0} sono già stati conservati per il batch {1} e l&#39;articolo {2} nel batch {3}.
@@ -6153,7 +6181,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Impostazioni per homepage del sito
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} è in attesa fino a {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ non sono consentite per {0} a causa del valutazione {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Crea Fattura d'Acquisto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Ferie Usate
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} I coupon utilizzati sono {1}. La quantità consentita è esaurita
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Vuoi inviare la richiesta materiale
 DocType: Job Offer,Awaiting Response,In attesa di risposta
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6167,6 +6197,7 @@
 DocType: Training Event Employee,Optional,Opzionale
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisi dell&#39;acqua
+DocType: Sales Order,Skip Delivery Note,Salta bolla di consegna
 DocType: Price List,Price Not UOM Dependent,Prezzo non dipendente dall&#39;UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} varianti create.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Esiste già un accordo sul livello di servizio predefinito.
@@ -6271,6 +6302,7 @@
 DocType: Vehicle,Last Carbon Check,Ultima verifica carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,Spese legali
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,Seleziona la quantità in fila
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},Ordine di lavoro {0}: scheda lavoro non trovata per l&#39;operazione {1}
 DocType: Purchase Invoice,Posting Time,Ora di Registrazione
 DocType: Timesheet,% Amount Billed,% Importo Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,Spese telefoniche
@@ -6373,7 +6405,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e spese aggiuntive
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Riga di ammortamento {0}: la successiva Data di ammortamento non può essere precedente alla Data disponibile per l&#39;uso
 ,Sales Funnel,imbuto di vendita
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Avanzamento attività
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carrello
@@ -6468,6 +6499,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","I Punti Fedeltà saranno calcolati a partire dal totale speso (tramite la Fattura di vendita), in base al fattore di raccolta menzionato."
 DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
+DocType: Pricing Rule,Coupon Code Based,Basato su codice coupon
 DocType: Company,HRA Settings,Impostazioni HRA
 DocType: Homepage,Hero Section,Sezione degli eroi
 DocType: Employee Transfer,Transfer Date,Data di trasferimento
@@ -6583,6 +6615,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Impostare il filtro aziendale vuoto se Group By è &#39;Azienda&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,La Data di Registrazione non può essere una data futura
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Fila # {0}: N. di serie {1} non corrisponde con {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 DocType: Stock Entry,Target Warehouse Address,Indirizzo del magazzino di destinazione
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Permesso retribuito
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Il tempo prima dell&#39;orario di inizio turno durante il quale il check-in dei dipendenti viene preso in considerazione per la partecipazione.
@@ -6617,7 +6650,6 @@
 DocType: Employee Grade,Employee Grade,Grado del dipendente
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,lavoro a cottimo
 DocType: GSTR 3B Report,June,giugno
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Share Balance,From No,Dal n
 DocType: Shift Type,Early Exit Grace Period,Periodo di tolleranza dell&#39;uscita anticipata
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
@@ -6902,7 +6934,6 @@
 DocType: Warehouse,Warehouse Name,Nome Magazzino
 DocType: Naming Series,Select Transaction,Selezionare Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Inserisci Approvazione ruolo o Approvazione utente
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Accordo sul livello di servizio con il tipo di entità {0} e l&#39;entità {1} esiste già.
 DocType: Journal Entry,Write Off Entry,Entry di Svalutazione
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
@@ -7040,6 +7071,7 @@
 DocType: Budget,Warn,Avvisa
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Tutti gli articoli sono già stati trasferiti per questo ordine di lavoro.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
+DocType: Bank Account,Company Account,Conto aziendale
 DocType: Asset Maintenance,Manufacturing User,Utente Produzione
 DocType: Purchase Invoice,Raw Materials Supplied,Materie prime fornite
 DocType: Subscription Plan,Payment Plan,Piano di pagamento
@@ -7081,6 +7113,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) non può essere maggiore della quantità pianificata ({2}) nell'ordine di lavoro {3}
 DocType: Certification Application,Name of Applicant,Nome del candidato
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Scheda attività per la produzione.
+DocType: Quick Stock Balance,Quick Stock Balance,Bilancio rapido delle scorte
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Sub Totale
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Impossibile modificare le proprietà Variant dopo la transazione stock. Dovrai creare un nuovo oggetto per farlo.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,Mandato GoCardless SEPA
@@ -7407,6 +7440,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},Impostare {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} è uno studente inattivo
 DocType: Employee,Health Details,Dettagli Salute
+DocType: Coupon Code,Coupon Type,Tipo di coupon
 DocType: Leave Encashment,Encashable days,Giorni incastrili
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Per creare un Riferimento di Richiesta di Pagamento è necessario un Documento
 DocType: Soil Texture,Sandy Clay,Sandy Clay
@@ -7689,6 +7723,7 @@
 DocType: Hotel Room Package,Amenities,Servizi
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Recupera automaticamente i termini di pagamento
 DocType: QuickBooks Migrator,Undeposited Funds Account,Conto fondi non trasferiti
+DocType: Coupon Code,Uses,usi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Non è consentito il modo di pagamento multiplo predefinito
 DocType: Sales Invoice,Loyalty Points Redemption,Punti fedeltà Punti di riscatto
 ,Appointment Analytics,Statistiche Appuntamento
@@ -7705,6 +7740,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,Budget totale
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lasciare vuoto se fai gruppi di studenti all&#39;anno
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Se selezionato, non totale. di giorni lavorativi includerà vacanze, e questo ridurrà il valore di salario per ogni giorno"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Impossibile aggiungere il dominio
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Per consentire l&#39;eccesso di scontrino / consegna, aggiorna &quot;Sovracontrollo / assegno di consegna&quot; in Impostazioni magazzino o Articolo."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Le app che utilizzano la chiave corrente non saranno in grado di accedere, sei sicuro?"
 DocType: Subscription Settings,Prorate,dividere proporzionalmente
@@ -7717,6 +7753,7 @@
 ,BOM Stock Report,Report Giacenza Distinta Base
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Se non è stata assegnata alcuna fascia oraria, la comunicazione verrà gestita da questo gruppo"
 DocType: Stock Reconciliation Item,Quantity Difference,Quantità Differenza
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 ,Electronic Invoice Register,Registro delle fatture elettroniche
@@ -7970,6 +8007,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Tasse e oneri dedotti (Azienda valuta)
 DocType: Item Group,General Settings,Impostazioni Generali
 DocType: Article,Article,Articolo
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Inserisci il codice coupon !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Da Valuta e A Valuta non possono essere gli stessi
 DocType: Taxable Salary Slab,Percent Deduction,Detrazione percentuale
 DocType: GL Entry,To Rename,Rinominare
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 795129d..8e72050 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,顧客連絡先
 DocType: Shift Type,Enable Auto Attendance,自動参加を有効にする
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,倉庫と日付を入力してください
 DocType: Lost Reason Detail,Opportunity Lost Reason,機会を失った理由
 DocType: Patient Appointment,Check availability,空室をチェック
 DocType: Retention Bonus,Bonus Payment Date,ボーナス支払日
@@ -265,6 +266,7 @@
 ,Completed Work Orders,完了した作業オーダー
 DocType: Support Settings,Forum Posts,フォーラム投稿
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",タスクはバックグラウンドジョブとしてエンキューされました。バックグラウンドでの処理に問題がある場合は、この在庫調整にエラーに関するコメントが追加され、ドラフト段階に戻ります。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",申し訳ありませんが、クーポンコードの有効性は開始されていません
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,課税額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: Leave Policy,Leave Policy Details,ポリシーの詳細を残す
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,消耗品
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,グレード
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Restaurant Table,No of Seats,席数
 DocType: Sales Invoice,Overdue and Discounted,期限切れおよび割引
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,切断された通話
@@ -506,6 +509,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,言葉の金額の行間隔
 DocType: Vehicle,Additional Details,さらなる詳細
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,説明がありません
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,倉庫からアイテムを取得する
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,仕入要求
 DocType: POS Closing Voucher Details,Collected Amount,回収額
 DocType: Lab Test,Submitted Date,提出日
@@ -613,6 +617,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,学ぶ
 ,Trial Balance (Simple),試算表（シンプル）
 DocType: Purchase Invoice Item,Enable Deferred Expense,繰延経費を有効にする
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,適用されたクーポンコード
 DocType: Asset,Next Depreciation Date,次の減価償却日
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,従業員一人あたりの活動費用
 DocType: Accounts Settings,Settings for Accounts,アカウント設定
@@ -849,8 +854,6 @@
 DocType: BOM,Work Order,作業命令
 DocType: Sales Invoice,Total Qty,合計数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,保護者2 メールID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","このドキュメントをキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 DocType: Item,Show in Website (Variant),ウェブサイトに表示（バリエーション）
 DocType: Employee,Health Concerns,健康への懸念
 DocType: Payroll Entry,Select Payroll Period,給与計算期間を選択
@@ -1014,6 +1017,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,源泉徴収勘定
 DocType: Pricing Rule,Sales Partner,販売パートナー
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,すべてのサプライヤスコアカード。
+DocType: Coupon Code,To be used to get discount,割引を受けるために使用する
 DocType: Buying Settings,Purchase Receipt Required,領収書が必要です
 DocType: Sales Invoice,Rail,レール
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,実費
@@ -1064,6 +1068,7 @@
 DocType: Production Plan,Production Plan,生産計画
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,インボイス作成ツールを開く
 DocType: Salary Component,Round to the Nearest Integer,最も近い整数に丸める
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,在庫のない商品をカートに追加できるようにする
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,販売返品
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,シリアルナンバーに基づいて取引で数量を設定する
 ,Total Stock Summary,総株式サマリー
@@ -1193,6 +1198,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),基本時間単価（会社通貨）
 ,Qty To Be Billed,請求される数量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,納品済額
+DocType: Coupon Code,Gift Card,ギフトカード
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,生産予約数量：製造品目を製造するための原料数量。
 DocType: Loyalty Point Entry Redemption,Redemption Date,償還日
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,この銀行取引はすでに完全に調整されています
@@ -1280,6 +1286,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,タイムシートを作成する
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,アカウント {0} が複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,請求書を購入する
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,30日以内に会員の有効期限が切れる場合にのみ更新することができます
 DocType: Shopping Cart Settings,Show Stock Availability,在庫を表示する
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},資産カテゴリ{1}または会社{2}に{0}を設定してください
@@ -1582,7 +1589,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",予約数量：販売用に数量が注文されていますが、納品されていません。
 DocType: Drug Prescription,Interval UOM,インターバル単位
 DocType: Customer,"Reselect, if the chosen address is edited after save",選択したアドレスが保存後に編集された場合は、再選択します。
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,外注の予約数量：外注品目を作成するための原料数量。
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,外注の予約数量：外注品目を作成するための原料数量。
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 DocType: Item,Hub Publishing Details,ハブ公開の詳細
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',「オープニング」
@@ -1845,6 +1852,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,アイテムと単位のインポート
 DocType: Repayment Schedule,Balance Loan Amount,残高貸付額
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,詳細に追加
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",申し訳ありませんが、クーポンコードは使い尽くされています
 DocType: Communication Medium,Catch All,すべてキャッチ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,スケジュールコース
 DocType: Budget,Applicable on Material Request,品目依頼に適用
@@ -2012,6 +2020,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,無効な属性
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1}は提出しなければなりません
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,メールキャンペーン
+DocType: Sales Partner,To Track inbound purchase,インバウンド購入を追跡するには
 DocType: Buying Settings,Default Supplier Group,デフォルトサプライヤグループ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},数量は以下でなければなりません{0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},{0}のコンポーネントの対象となる最大金額が{1}を超えています
@@ -2167,8 +2176,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,在庫登録
 DocType: Hotel Room Reservation,Hotel Reservation User,ホテル予約ユーザー
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ステータス設定
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [ナンバリングシリーズ]から出席のナンバリングシリーズを設定してください
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,接頭辞を選択してください
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{0}の命名シリーズを設定してください
 DocType: Contract,Fulfilment Deadline,フルフィルメントの締め切り
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,あなたの近く
 DocType: Student,O-,O-
@@ -2292,6 +2301,7 @@
 DocType: Quality Meeting Table,Under Review,レビュー中
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,ログインに失敗しました
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,アセット{0}が作成されました
+DocType: Coupon Code,Promotional,プロモーション
 DocType: Special Test Items,Special Test Items,特別試験項目
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplaceに登録するには、System ManagerおよびItem Managerの役割を持つユーザーである必要があります。
 apps/erpnext/erpnext/config/buying.py,Key Reports,主なレポート
@@ -2329,6 +2339,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,文書タイプ
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
 DocType: Subscription Plan,Billing Interval Count,請求間隔のカウント
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","このドキュメントをキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,予定と患者の出会い
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,値がありません
 DocType: Employee,Department and Grade,学科と学年
@@ -2431,6 +2443,7 @@
 DocType: Project,Start and End Dates,開始・終了日
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,契約テンプレートの履行条件
 ,Delivered Items To Be Billed,未入金の納品済アイテム
+DocType: Coupon Code,Maximum Use,最大使用
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},BOM {0} を開く
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,倉庫は製造番号によって変更することはできません。
 DocType: Authorization Rule,Average Discount,平均割引
@@ -2593,6 +2606,7 @@
 DocType: Item,Inventory,在庫
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Jsonとしてダウンロード
 DocType: Item,Sales Details,販売明細
+DocType: Coupon Code,Used,中古
 DocType: Opportunity,With Items,関連アイテム
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',キャンペーン &#39;{0}&#39;は既に{1} &#39;{2}&#39;に存在します
 DocType: Asset Maintenance,Maintenance Team,保守チーム
@@ -2723,7 +2737,7 @@
 						Serial No cannot be ensured",アイテム{0}の有効なBOMが見つかりませんでした。 \ Serial Noによる配送は保証されません
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 DocType: Loan Type,Maximum Loan Amount,最大融資額
-DocType: Pricing Rule,Pricing Rule,価格設定ルール
+DocType: Coupon Code,Pricing Rule,価格設定ルール
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},生徒{0}のロール番号が重複しています
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,仕入注文のための資材要求
 DocType: Company,Default Selling Terms,デフォルトの販売条件
@@ -2802,6 +2816,7 @@
 DocType: Payment Schedule,Payment Amount,支払金額
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,半日の日付は、作業日と作業終了日の間にある必要があります
 DocType: Healthcare Settings,Healthcare Service Items,医療サービス項目
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,無効なバーコード。このバーコードに添付されたアイテムはありません。
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,消費額
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,現金の純変更
 DocType: Assessment Plan,Grading Scale,評価尺度
@@ -2921,7 +2936,6 @@
 DocType: Share Transfer,Asset Account,アセットアカウント
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,新しいリリース日は将来になるはずです
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 DocType: Lab Test,Technician Name,技術者名
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3033,6 +3047,7 @@
 DocType: Products Settings,Hide Variants,バリアントを隠す
 DocType: Lead,Next Contact By,次回連絡
 DocType: Compensatory Leave Request,Compensatory Leave Request,補償休暇申請
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",行{1}のアイテム{0}に対して{2}を超えて超過請求することはできません。超過請求を許可するには、アカウント設定で許可を設定してください
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},行{1}のアイテム{0}に必要な数量
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},アイテム{1}が存在するため倉庫{0}を削除することができません
 DocType: Blanket Order,Order Type,注文タイプ
@@ -3202,7 +3217,6 @@
 DocType: Student,Student Mobile Number,生徒携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
 DocType: Employee Benefit Claim,Claim Benefit For,のための請求の利益
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",行{1}のアイテム{0}を{2}以上にオーバレイすることはできません。超過請求を許可するには、在庫設定で設定してください
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,レスポンスの更新
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},項目を選択済みです {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
@@ -3492,6 +3506,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,会社に通貨を指定してください
 DocType: Workstation,Wages per hour,時間あたり賃金
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},{0}を設定
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},倉庫 {3} のアイテム {2} ではバッチ {0} の在庫残高がマイナス {1} になります
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,以下の資材要求は、アイテムの再注文レベルに基づいて自動的に提出されています
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
@@ -3821,6 +3836,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,給与伝票を提出
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,保留
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,qustionには少なくとも1つの正しいオプションが必要です
+apps/erpnext/erpnext/hooks.py,Purchase Orders,発注書
 DocType: Account,Inter Company Account,インターカンパニーアカウント
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,一括でインポート
 DocType: Sales Partner,Address & Contacts,住所・連絡先
@@ -3831,6 +3847,7 @@
 DocType: POS Profile,[Select],[選択]
 DocType: Staffing Plan Detail,Number Of Positions,ポジション数
 DocType: Vital Signs,Blood Pressure (diastolic),血圧（下）
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,顧客を選択してください。
 DocType: SMS Log,Sent To,送信先
 DocType: Agriculture Task,Holiday Management,休暇管理
 DocType: Payment Request,Make Sales Invoice,納品書を作成
@@ -4041,7 +4058,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1}は提出されていません
 DocType: Subscription,Trialling,トライアル
 DocType: Sales Invoice Item,Deferred Revenue,繰延収益
-DocType: Bank Account,GL Account,GLアカウント
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,請求書作成に使用される現金勘定
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,免除サブカテゴリ
 DocType: Member,Membership Expiry Date,会員有効期限
@@ -4470,13 +4486,13 @@
 DocType: C-Form Invoice Detail,Territory,地域
 DocType: Pricing Rule,Apply Rule On Item Code,商品コードにルールを適用
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,必要な訪問の数を記述してください
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,在庫残高レポート
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,費用
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,累積金額を表示する
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,更新中です。しばらくお待ちください。
 DocType: Production Plan Item,Produced Qty,生産数量
 DocType: Vehicle Log,Fuel Qty,燃料数量
-DocType: Stock Entry,Target Warehouse Name,ターゲット倉庫名
 DocType: Work Order Operation,Planned Start Time,計画開始時間
 DocType: Course,Assessment,評価
 DocType: Payment Entry Reference,Allocated,割り当て済み
@@ -4553,10 +4569,12 @@
  1.紛争に対処する方法、賠償、責任など
  1.住所とあなたの会社の連絡先"
 DocType: Homepage Section,Section Based On,に基づくセクション
+DocType: Shopping Cart Settings,Show Apply Coupon Code,クーポンコードの適用を表示
 DocType: Issue,Issue Type,課題タイプ
 DocType: Attendance,Leave Type,休暇タイプ
 DocType: Purchase Invoice,Supplier Invoice Details,サプライヤの請求書の詳細
 DocType: Agriculture Task,Ignore holidays,休暇を無視する
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,クーポン条件の追加/編集
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用／差損益（{0}）は「損益」アカウントである必要があります
 DocType: Stock Entry Detail,Stock Entry Child,株式エントリーチャイルド
 DocType: Project,Copied From,コピー元
@@ -4731,6 +4749,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,評価計画基準
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,トランザクション
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,注文停止
+DocType: Coupon Code,Coupon Name,クーポン名
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,影響を受けやすいです
 DocType: Email Campaign,Scheduled,スケジュール設定済
 DocType: Shift Type,Working Hours Calculation Based On,に基づく労働時間の計算
@@ -4747,7 +4766,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,バリエーションを作成
 DocType: Vehicle,Diesel,ディーゼル
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,価格表の通貨が選択されていません
+DocType: Quick Stock Balance,Available Quantity,利用可能な数量
 DocType: Purchase Invoice,Availed ITC Cess,入手可能なITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,教育&gt;教育の設定でインストラクターの命名システムを設定してください
 ,Student Monthly Attendance Sheet,生徒月次出席シート
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,配送ルールは販売にのみ適用されます
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,減価償却行{0}：次の減価償却日は購入日より前にすることはできません
@@ -4814,8 +4835,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
 DocType: Quality Meeting,Quality Meeting,質の高い会議
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,グループに非グループ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{0}の命名シリーズを設定してください
 DocType: Employee,ERPNext User,ERPNextユーザー
+DocType: Coupon Code,Coupon Description,クーポンの説明
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},行{0}にバッチが必須です
 DocType: Company,Default Buying Terms,デフォルトの購入条件
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,領収書アイテム供給済
@@ -4978,6 +4999,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,文書詳細番号に対して
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},国{0}の削除は許可されていません
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,当事者タイプは必須です
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,クーポンコードを適用
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",ジョブカード{0}の場合は、 &#39;製造のための品目転送&#39;タイプの在庫エントリしか作成できません。
 DocType: Quality Inspection,Outgoing,支出
 DocType: Customer Feedback Table,Customer Feedback Table,顧客フィードバック表
@@ -5127,7 +5149,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,発注書提出時
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,すべてのサプライヤーを追加
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行番号{0}：割り当て金額は未払い金額より大きくすることはできません。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Tally Migration,Parties,締約国
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,担保ローン
@@ -5159,7 +5180,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},アイテム{0}の代替アイテムを設定できません
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,決裁者
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]でインストラクターの命名システムを設定してください
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),利用可能な純ITC（A） - （B）
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,料金の作成
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
@@ -5184,6 +5204,7 @@
 DocType: Quiz Result,Wrong,違う
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,価格表の通貨が顧客の基本通貨に換算されるレート
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額（会社通貨）
+DocType: Sales Partner,Referral Code,紹介コード
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,総引き渡し額は、総額を超えてはならない
 DocType: Salary Slip,Hour Rate,時給
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,自動並べ替えを有効にする
@@ -5312,6 +5333,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,在庫数を表示する
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,事業からの純キャッシュ・フロー
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},行＃{0}：請求書割引{2}のステータスは{1}でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数（{0}-&gt; {1}）が見つかりません：{2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,アイテム4
 DocType: Student Admission,Admission End Date,入場終了日
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,サブ契約
@@ -5334,6 +5356,7 @@
 DocType: Travel Request,Fully Sponsored,完全にスポンサーされた
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,逆仕訳入力
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,求人カードを作成する
+DocType: Quotation,Referral Sales Partner,紹介販売パートナー
 DocType: Quality Procedure Process,Process Description,過程説明
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,顧客 {0} が作成されました。
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,現在どの倉庫にも在庫がありません
@@ -5468,6 +5491,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,部品表通貨レート
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,アップロードされたファイルを読む
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",停止した作業指示を取り消すことはできません。取り消すには最初に取り消してください
+DocType: Coupon Code,Coupon Code,クーポンコード
 DocType: Asset,Journal Entry for Scrap,スクラップ用の仕訳
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,納品書からアイテムを抽出してください
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},行{0}：操作{1}に対するワークステーションを選択します。
@@ -5550,6 +5574,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,「日付」は必須です
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,データインポート・エクスポート
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",申し訳ありませんが、クーポンコードの有効期限が切れています
 DocType: Bank Account,Account Details,口座詳細
 DocType: Crop,Materials Required,必要な材料
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,生徒が存在しません
@@ -5587,6 +5612,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,ユーザーに移動
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,支払額＋償却額は総計を超えることはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0}はアイテム{1}に対して有効なバッチ番号ではありません
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,有効なクーポンコードを入力してください!!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},注：休暇タイプ{0}のための休暇残高が足りません
 DocType: Task,Task Description,タスク説明
 DocType: Training Event,Seminar,セミナー
@@ -5850,6 +5876,7 @@
 ,TDS Payable Monthly,毎月TDS支払可能
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,BOMを置き換えるために待機します。数分かかることがあります。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,総支払い
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},アイテム{0}には複数のシリアル番号が必要です
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,請求書と一致支払い
@@ -5939,6 +5966,7 @@
 DocType: Production Plan,Get Raw Materials For Production,生産のための原材料を入手する
 DocType: Job Opening,Job Title,職業名
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,将来の支払い参照
+DocType: Quotation,Additional Discount and Coupon Code,追加割引とクーポンコード
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0}は{1}が見積提出されないことを示していますが、全てのアイテムは見積もられています。 見積依頼の状況を更新しています。
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,最大サンプル - {0} はバッチ {1} およびバッチ {3} 内のアイテム {2} として既に保管されています。
@@ -6166,7 +6194,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,ウェブサイトのホームページの設定
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0}は{1}まで保留中です
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},スコアカードが{1}のためRFQは{0}には許可されていません
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,仕入請求書を作成
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,中古の葉
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0}使用されるクーポンは{1}です。許容量を使い果たしました
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,資料請求を提出しますか
 DocType: Job Offer,Awaiting Response,応答を待っています
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6180,6 +6210,7 @@
 DocType: Training Event Employee,Optional,任意
 DocType: Salary Slip,Earning & Deduction,収益と控除
 DocType: Agriculture Analysis Criteria,Water Analysis,水質分析
+DocType: Sales Order,Skip Delivery Note,納品書をスキップ
 DocType: Price List,Price Not UOM Dependent,UOMに依存しない価格
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0}バリアントが作成されました。
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,デフォルトのサービスレベル契約がすでに存在します。
@@ -6284,6 +6315,7 @@
 DocType: Vehicle,Last Carbon Check,最後のカーボンチェック
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,訴訟費用
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,行数量を選択してください
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},作業指示{0}：操作{1}のジョブカードが見つかりません
 DocType: Purchase Invoice,Posting Time,投稿時間
 DocType: Timesheet,% Amount Billed,％請求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,電話代
@@ -6386,7 +6418,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,減価償却行{0}：次の減価償却日は、使用可能日前にすることはできません
 ,Sales Funnel,セールスファネル
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,カート
@@ -6481,6 +6512,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",ロイヤリティポイントは、記載されている回収率に基づいて、（販売請求書によって）完了した使用額から計算されます。
 DocType: Program Enrollment Tool,Enroll Students,生徒を登録
+DocType: Pricing Rule,Coupon Code Based,クーポンコードベース
 DocType: Company,HRA Settings,HRAの設定
 DocType: Homepage,Hero Section,ヒーローセクション
 DocType: Employee Transfer,Transfer Date,転送日
@@ -6597,6 +6629,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Group Byが &#39;Company&#39;の場合、Companyフィルターを空白に設定してください
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,転記日付は将来の日付にすることはできません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：シリアル番号 {1} が {2} {3}と一致しません
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [ナンバリングシリーズ]から出席のナンバリングシリーズを設定してください
 DocType: Stock Entry,Target Warehouse Address,ターゲット倉庫の住所
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,臨時休暇
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,従業員チェックインが出席のために考慮される間のシフト開始時間の前の時間。
@@ -6631,7 +6664,6 @@
 DocType: Employee Grade,Employee Grade,従業員グレード
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,出来高制
 DocType: GSTR 3B Report,June,六月
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Share Balance,From No,〜から
 DocType: Shift Type,Early Exit Grace Period,早期終了猶予期間
 DocType: Task,Actual Time (in Hours),実際の時間（時）
@@ -6914,7 +6946,6 @@
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,「役割承認」または「ユーザー承認」を入力してください
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数（{0}-&gt; {1}）が見つかりません：{2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,エンティティタイプ{0}とエンティティ{1}のサービスレベル契約が既に存在します。
 DocType: Journal Entry,Write Off Entry,償却エントリ
 DocType: BOM,Rate Of Materials Based On,資材単価基準
@@ -7052,6 +7083,7 @@
 DocType: Budget,Warn,警告する
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,すべてのアイテムは、この作業オーダーのために既に転送されています。
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
+DocType: Bank Account,Company Account,企業アカウント
 DocType: Asset Maintenance,Manufacturing User,製造ユーザー
 DocType: Purchase Invoice,Raw Materials Supplied,原材料供給
 DocType: Subscription Plan,Payment Plan,支払計画
@@ -7093,6 +7125,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},作業オーダー{3}で{0}（{1}）は計画数量（{2}）を上回ることはできません
 DocType: Certification Application,Name of Applicant,応募者の氏名
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,製造のための勤務表。
+DocType: Quick Stock Balance,Quick Stock Balance,クイックストックバランス
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,小計
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,株式取引後にバリアントプロパティを変更することはできません。これを行うには、新しいアイテムを作成する必要があります。
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPAマンデート
@@ -7419,6 +7452,7 @@
 apps/erpnext/erpnext/public/js/queries.js,Please set {0},{0}を設定してください
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0}  -  {1}は非アクティブな生徒です
 DocType: Employee,Health Details,健康の詳細
+DocType: Coupon Code,Coupon Type,クーポンの種類
 DocType: Leave Encashment,Encashable days,Encashable days
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,支払依頼を作成するには参照書類が必要です
 DocType: Soil Texture,Sandy Clay,砂質粘土
@@ -7703,6 +7737,7 @@
 DocType: Hotel Room Package,Amenities,アメニティ
 DocType: Accounts Settings,Automatically Fetch Payment Terms,支払い条件を自動的に取得する
 DocType: QuickBooks Migrator,Undeposited Funds Account,未払い資金口座
+DocType: Coupon Code,Uses,用途
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,複数のデフォルトの支払い方法は許可されていません
 DocType: Sales Invoice,Loyalty Points Redemption,ロイヤリティポイント償還
 ,Appointment Analytics,予約分析
@@ -7719,6 +7754,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py,Total Budget,総予算
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,年ごとに生徒グループを作る場合は空欄にしてください
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day",チェックした場合、営業日数は全て祝日を含みますが、これにより1日あたりの給与の値は小さくなります
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,ドメインを追加できませんでした
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",入庫/配送の超過を許可するには、在庫設定またはアイテムの「入庫/配送許可超過」を更新します。
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?",現在の鍵を使用しているアプリケーションはアクセスできません。本当ですか？
 DocType: Subscription Settings,Prorate,比喩
@@ -7731,6 +7767,7 @@
 ,BOM Stock Report,BOM在庫レポート
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",割り当てられたタイムスロットがない場合、通信はこのグループによって処理されます。
 DocType: Stock Reconciliation Item,Quantity Difference,数量違い
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 ,Electronic Invoice Register,電子請求書レジスタ
@@ -7984,6 +8021,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),租税公課控除（会社通貨）
 DocType: Item Group,General Settings,一般設定
 DocType: Article,Article,記事
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,クーポンコードを入力してください!!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,同じ通貨には変更できません
 DocType: Taxable Salary Slab,Percent Deduction,減額率
 DocType: GL Entry,To Rename,名前を変更する
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index ca381fd..fefd314 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY.-
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
 DocType: Shift Type,Enable Auto Attendance,បើកការចូលរួមដោយស្វ័យប្រវត្តិ។
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,សូមបញ្ចូលឃ្លាំងនិងកាលបរិច្ឆេទ
 DocType: Lost Reason Detail,Opportunity Lost Reason,ឱកាសបាត់បង់ហេតុផល។
 DocType: Patient Appointment,Check availability,ពិនិត្យភាពអាចរកបាន
 DocType: Retention Bonus,Bonus Payment Date,ថ្ងៃបង់ប្រាក់រង្វាន់
@@ -264,6 +265,7 @@
 ,Completed Work Orders,បានបញ្ចប់ការបញ្ជាទិញការងារ
 DocType: Support Settings,Forum Posts,ប្រកាសវេទិកា
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",ភារកិច្ចត្រូវបានគេប្រមូលជាការងារផ្ទៃខាងក្រោយ។ ក្នុងករណីមានបញ្ហាណាមួយទាក់ទងនឹងដំណើរការក្នុងប្រព័ន្ធផ្ទៃខាងក្រោយប្រព័ន្ធនឹងបន្ថែមមតិយោបល់អំពីកំហុសលើការផ្សះផ្សាភាគហ៊ុននេះហើយត្រលប់ទៅដំណាក់កាលព្រាង
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",សូមទោសលេខកូដប័ណ្ណមានសុពលភាពមិនបានចាប់ផ្តើមទេ
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,ចំនួនទឹកប្រាក់ដែលត្រូវជាប់ពន្ធ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: Leave Policy,Leave Policy Details,ចាកចេញពីព័ត៌មានលម្អិតអំពីគោលនយោបាយ
@@ -328,6 +330,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ប្រើប្រាស់
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,ថ្នាក់ទី
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក
 DocType: Restaurant Table,No of Seats,ចំនួនកៅអី
 DocType: Sales Invoice,Overdue and Discounted,ហួសកាលកំណត់និងបញ្ចុះតំលៃ។
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,ការហៅត្រូវបានផ្តាច់។
@@ -504,6 +507,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,គម្លាតបន្ទាត់សម្រាប់ចំនួននៅក្នុងពាក្យ
 DocType: Vehicle,Additional Details,សេចក្ដីលម្អិតបន្ថែម
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,ការពិពណ៌នាដែលបានផ្ដល់ឱ្យមិនមាន
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,ទាញយកធាតុពីឃ្លាំង
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,ស្នើសុំសម្រាប់ការទិញ។
 DocType: POS Closing Voucher Details,Collected Amount,ចំនួនសរុបដែលបានប្រមូល
 DocType: Lab Test,Submitted Date,កាលបរិច្ឆេទដែលបានដាក់ស្នើ
@@ -611,6 +615,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,រៀន
 ,Trial Balance (Simple),តុល្យភាពនៃការសាកល្បង (សាមញ្ញ)
 DocType: Purchase Invoice Item,Enable Deferred Expense,បើកដំណើរការការពន្យារពេល
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,អនុវត្តលេខកូដគូប៉ុង
 DocType: Asset,Next Depreciation Date,រំលស់បន្ទាប់កាលបរិច្ឆេទ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,តម្លៃសកម្មភាពដោយបុគ្គលិក
 DocType: Accounts Settings,Settings for Accounts,ការកំណត់សម្រាប់គណនី
@@ -845,8 +850,6 @@
 DocType: BOM,Work Order,លំដាប់ការងារ
 DocType: Sales Invoice,Total Qty,សរុប Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,លេខសម្គាល់អ៊ីមែល Guardian2
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីលុបចោលឯកសារនេះ។"
 DocType: Item,Show in Website (Variant),បង្ហាញក្នុងវេបសាយ (វ៉ារ្យង់)
 DocType: Employee,Health Concerns,ការព្រួយបារម្ភសុខភាព
 DocType: Payroll Entry,Select Payroll Period,ជ្រើសរយៈពេលបើកប្រាក់បៀវត្ស
@@ -1007,6 +1010,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,គណនីបង់ពន្ធ
 DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,កាតពិន្ទុទាំងអស់របស់អ្នកផ្គត់ផ្គង់។
+DocType: Coupon Code,To be used to get discount,ត្រូវបានប្រើដើម្បីទទួលបានការបញ្ចុះតម្លៃ
 DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
 DocType: Sales Invoice,Rail,រថភ្លើង
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ការចំណាយជាក់ស្តែង។
@@ -1056,6 +1060,7 @@
 DocType: Production Plan,Production Plan,ផែនការផលិតកម្ម
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,បើកឧបករណ៍បង្កើតវិក្កយបត្រ
 DocType: Salary Component,Round to the Nearest Integer,បង្គត់ទៅចំនួនគត់ជិតបំផុត។
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,អនុញ្ញាតឱ្យវត្ថុដែលមិនមាននៅក្នុងស្តុកត្រូវបានបន្ថែមទៅរទេះ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,ត្រឡប់មកវិញការលក់
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,កំណត់ Qty នៅក្នុងប្រតិបត្តិការដែលមានមូលដ្ឋានលើលេខស៊េរី
 ,Total Stock Summary,សង្ខេបហ៊ុនសរុប
@@ -1185,6 +1190,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),អត្រាហួរមូលដ្ឋាន (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 ,Qty To Be Billed,Qty ត្រូវបានចេញវិក្កយបត្រ។
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ចំនួនទឹកប្រាក់ដែលបានបញ្ជូន
+DocType: Coupon Code,Gift Card,កាតអំណោយ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty ដែលបានបម្រុងទុកសម្រាប់ផលិតកម្ម៖ បរិមាណវត្ថុធាតុដើមដើម្បីផលិតរបស់របរ។
 DocType: Loyalty Point Entry Redemption,Redemption Date,កាលបរិច្ឆេទការប្រោសលោះ
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,ប្រតិបត្តិការធនាគារនេះត្រូវបានផ្សះផ្សារួចហើយ។
@@ -1271,6 +1277,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,បង្កើត Timesheet ។
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,វិក័យប័ត្រទិញ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,អ្នកអាចបន្តបានលុះត្រាតែសមាជិកភាពរបស់អ្នកផុតកំណត់ក្នុងរយៈពេល 30 ថ្ងៃ
 DocType: Shopping Cart Settings,Show Stock Availability,បង្ហាញស្តង់ដារដែលអាចរកបាន
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},កំណត់ {0} នៅក្នុងប្រភេទទ្រព្យសម្បត្តិ {1} ឬក្រុមហ៊ុន {2}
@@ -1546,7 +1553,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",Qty បានបម្រុងទុក: បរិមាណបានបញ្ជាទិញសម្រាប់លក់ប៉ុន្តែមិនបានប្រគល់ឱ្យទេ។
 DocType: Drug Prescription,Interval UOM,ចន្លោះពេលវេលា UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",ជ្រើសរើសបើអាសយដ្ឋានដែលបានជ្រើសត្រូវបានកែសម្រួលបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Qty ដែលបានបម្រុងទុកសម្រាប់កិច្ចសន្យារង: បរិមាណវត្ថុធាតុដើមដើម្បីធ្វើឱ្យវត្ថុរង។
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qty ដែលបានបម្រុងទុកសម្រាប់កិច្ចសន្យារង: បរិមាណវត្ថុធាតុដើមដើម្បីធ្វើឱ្យវត្ថុរង។
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Item,Hub Publishing Details,ពត៌មានលម្អិតការបោះពុម្ព
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&quot;ការបើក&quot;
@@ -1809,6 +1816,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,ការនាំចូលទំនិញនិង UOMs ។
 DocType: Repayment Schedule,Balance Loan Amount,តុល្យភាពប្រាក់កម្ចីចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,បានបន្ថែមទៅព័ត៌មានលម្អិត
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",សូមទោសលេខកូដប័ណ្ណបានអស់ហើយ
 DocType: Communication Medium,Catch All,ចាប់ទាំងអស់។
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,វគ្គកាលវិភាគ
 DocType: Budget,Applicable on Material Request,អនុវត្តលើសំណើសុំសម្ភារៈ
@@ -1976,6 +1984,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} ត្រូវតែបានដាក់ស្នើ
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,យុទ្ធនាការអ៊ីមែល។
+DocType: Sales Partner,To Track inbound purchase,ដើម្បីតាមដានការទិញពីខាងក្រៅ
 DocType: Buying Settings,Default Supplier Group,ក្រុមអ្នកផ្គត់ផ្គង់លំនាំដើម
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},ចំនួនទឹកប្រាក់អតិបរមាមានសិទ្ធិទទួលបានសមាសភាគ {0} លើសពី {1}
@@ -2130,8 +2139,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ធ្វើឱ្យធាតុចូល។
 DocType: Hotel Room Reservation,Hotel Reservation User,អ្នកប្រើប្រាស់កក់សណ្ឋាគារ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,កំណត់ស្ថានភាព។
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង។
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ
 DocType: Contract,Fulfilment Deadline,ថ្ងៃផុតកំណត់
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,នៅក្បែរអ្នក។
 DocType: Student,O-,O-
@@ -2255,6 +2264,7 @@
 DocType: Quality Meeting Table,Under Review,កំពុងពិនិត្យ។
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,បានបរាជ័យក្នុងការចូល
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,ទ្រព្យសម្បត្តិ {0} បានបង្កើត
+DocType: Coupon Code,Promotional,ផ្សព្វផ្សាយ
 DocType: Special Test Items,Special Test Items,ធាតុសាកល្បងពិសេស
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,អ្នកត្រូវតែជាអ្នកប្រើដែលមានកម្មវិធីគ្រប់គ្រងប្រព័ន្ធនិងធាតុកម្មវិធីគ្រប់គ្រងធាតុដើម្បីចុះឈ្មោះនៅលើទីផ្សារ។
 apps/erpnext/erpnext/config/buying.py,Key Reports,របាយការណ៍សំខាន់ៗ។
@@ -2292,6 +2302,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,ប្រភេទឯកសារ
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
 DocType: Subscription Plan,Billing Interval Count,រាប់ចន្លោះពេលចេញវិក្កយបត្រ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីលុបចោលឯកសារនេះ"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,ការណាត់ជួបនិងជួបអ្នកជម្ងឺ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,បាត់តម្លៃ
 DocType: Employee,Department and Grade,នាយកដ្ឋាននិងថ្នាក់
@@ -2394,6 +2406,7 @@
 DocType: Project,Start and End Dates,ចាប់ផ្តើមនិងបញ្ចប់កាលបរិច្ឆេទ
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,លក្ខខណ្ឌកិច្ចព្រមព្រៀងគំរូកិច្ចសន្យា
 ,Delivered Items To Be Billed,មុខទំនិញទៅដល់ត្រូវបង់លុយ
+DocType: Coupon Code,Maximum Use,ការប្រើប្រាស់អតិបរមា
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ការបើកចំហ Bom {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,ឃ្លាំងមិនអាចត្រូវបានផ្លាស់ប្តូរសម្រាប់លេខស៊េរី
 DocType: Authorization Rule,Average Discount,ការបញ្ចុះតម្លៃជាមធ្យម
@@ -2553,6 +2566,7 @@
 DocType: Item,Inventory,សារពើភ័ណ្ឌ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,ទាញយកជា Json ។
 DocType: Item,Sales Details,ពត៌មានលំអិតការលក់
+DocType: Coupon Code,Used,បានប្រើ
 DocType: Opportunity,With Items,ជាមួយនឹងការធាតុ
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',យុទ្ធនាការ &#39;{0}&#39; មានរួចហើយសម្រាប់ {1} &#39;{2}&#39;
 DocType: Asset Maintenance,Maintenance Team,ក្រុមថែទាំ
@@ -2681,7 +2695,7 @@
 						Serial No cannot be ensured",រកមិនឃើញ BOM សកម្មសម្រាប់ធាតុ {0} ទេ។ ការចែកចាយដោយ \ Serial No មិនអាចធានាបានទេ
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
 DocType: Loan Type,Maximum Loan Amount,ចំនួនទឹកប្រាក់កម្ចីអតិបរមា
-DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
+DocType: Coupon Code,Pricing Rule,វិធានការកំណត់តម្លៃ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},ចំនួនសិស្សស្ទួនរមៀល {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Company,Default Selling Terms,លក្ខខណ្ឌលក់លំនាំដើម។
@@ -2760,6 +2774,7 @@
 DocType: Payment Schedule,Payment Amount,ចំនួនទឹកប្រាក់ការទូទាត់
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,ថ្ងៃពាក់កណ្តាលថ្ងៃគួរស្ថិតនៅចន្លោះរវាងការងារពីកាលបរិច្ឆេទបញ្ចប់និងកាលបរិច្ឆេទការងារ
 DocType: Healthcare Settings,Healthcare Service Items,សេវាកម្មថែទាំសុខភាព
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,លេខកូដមិនត្រឹមត្រូវ។ មិនមានធាតុភ្ជាប់ជាមួយលេខកូដនេះទេ។
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Assessment Plan,Grading Scale,ធ្វើមាត្រដ្ឋានពិន្ទុ
@@ -2879,7 +2894,6 @@
 DocType: Share Transfer,Asset Account,គណនីទ្រព្យសកម្ម
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,កាលបរិច្ឆេទចេញផ្សាយថ្មីគួរតែមាននៅពេលអនាគត។
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស។
 DocType: Lab Test,Technician Name,ឈ្មោះអ្នកបច្ចេកទេស
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2989,6 +3003,7 @@
 DocType: Products Settings,Hide Variants,លាក់វ៉ារ្យ៉ង់។
 DocType: Lead,Next Contact By,ទំនាក់ទំនងបន្ទាប់ដោយ
 DocType: Compensatory Leave Request,Compensatory Leave Request,សំណើសុំប្រាក់សំណង
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",មិនអាចលើសថ្លៃសម្រាប់ធាតុ {0} ក្នុងជួរ {1} លើសពី {2} ។ ដើម្បីអនុញ្ញាតវិក័យប័ត្រលើសសូមកំណត់ប្រាក់ឧបត្ថម្ភនៅក្នុងការកំណត់គណនី
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},បរិមាណដែលទាមទារសម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},ឃ្លាំង {0} មិនអាចត្រូវបានលុបជាបរិមាណមានសម្រាប់ធាតុ {1}
 DocType: Blanket Order,Order Type,ប្រភេទលំដាប់
@@ -3157,7 +3172,6 @@
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
 DocType: Employee Benefit Claim,Claim Benefit For,ទាមទារអត្ថប្រយោជន៍សម្រាប់
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",មិនអាចវាយតម្លៃធាតុ {0} ក្នុងជួរដេក {1} ច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យចេញវិក័យប័ត្រសូមកំណត់នៅក្នុងការកំណត់ស្តុក
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,ធ្វើបច្ចុប្បន្នភាពចម្លើយ
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
@@ -3443,6 +3457,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,សូមបញ្ជាក់រូបិយប័ណ្ណនៅក្នុងក្រុមហ៊ុន
 DocType: Workstation,Wages per hour,ប្រាក់ឈ្នួលក្នុងមួយម៉ោង
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},តំឡើង {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,បន្ទាប់ពីការសម្ភារៈសំណើត្រូវបានលើកឡើងដោយស្វ័យប្រវត្តិដោយផ្អែកលើកម្រិតឡើងវិញដើម្បីធាតុរបស់
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
@@ -3771,6 +3786,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,ដាក់ស្នើប្រាក់ខែគ្រូពេទ្យប្រហែលជា
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,រង់ចាំ
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,យ៉ាងហោចណាស់សត្វព្រៃត្រូវតែមានជម្រើសត្រឹមត្រូវយ៉ាងហោចណាស់មួយ។
+apps/erpnext/erpnext/hooks.py,Purchase Orders,បញ្ជាទិញ
 DocType: Account,Inter Company Account,គណនីក្រុមហ៊ុនអន្ដរជាតិ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,នាំចូលក្នុងក្រុម
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាន &amp; ទំនាក់ទំនង
@@ -3781,6 +3797,7 @@
 DocType: POS Profile,[Select],[ជ្រើសរើស]
 DocType: Staffing Plan Detail,Number Of Positions,ចំនួនតំណែង
 DocType: Vital Signs,Blood Pressure (diastolic),សម្ពាធឈាម (Diastolic)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,សូមជ្រើសរើសអតិថិជន។
 DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
 DocType: Agriculture Task,Holiday Management,ការគ្រប់គ្រងថ្ងៃឈប់សម្រាក
 DocType: Payment Request,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
@@ -3989,7 +4006,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} មិនត្រូវបានដាក់ស្នើ
 DocType: Subscription,Trialling,Trialling
 DocType: Sales Invoice Item,Deferred Revenue,ចំណូលដែលពន្យាពេល
-DocType: Bank Account,GL Account,ហ្គ្រេនគណនី។
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,គណនីសាច់ប្រាក់នឹងត្រូវបានប្រើសម្រាប់ការបង្កើតវិក័យប័ត្រលក់
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,ការលើកលែងប្រភេទរង
 DocType: Member,Membership Expiry Date,ថ្ងៃផុតកំណត់សមាជិក
@@ -4387,13 +4403,13 @@
 DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
 DocType: Pricing Rule,Apply Rule On Item Code,អនុវត្តវិធានលើលេខកូដធាតុ។
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,របាយការណ៍សមតុល្យភាគហ៊ុន
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,ថ្លៃសេវា
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,បង្ហាញចំនួនទឹកប្រាក់កើនឡើង
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,កំពុងធ្វើបច្ចុប្បន្នភាព។ វាអាចចំណាយពេលបន្តិច។
 DocType: Production Plan Item,Produced Qty,ផលិត Qty
 DocType: Vehicle Log,Fuel Qty,ប្រេងឥន្ធនៈ Qty
-DocType: Stock Entry,Target Warehouse Name,ឈ្មោះឃ្លាំងគោលដៅ
 DocType: Work Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
 DocType: Course,Assessment,ការវាយតំលៃ
 DocType: Payment Entry Reference,Allocated,ត្រៀមបម្រុងទុក
@@ -4459,10 +4475,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","លក្ខខណ្ឌក្នុងស្ដង់ដារនិងលក្ខខណ្ឌដែលអាចត្រូវបានបន្ថែមទៅការលក់និងការទិញ។ ឧទាហរណ៏: 1. សុពលភាពនៃការផ្តល់ជូននេះ។ 1. លក្ខខណ្ឌក្នុងការទូទាត់ (មុន, នៅលើឥណទានដែលជាផ្នែកមួយមុនល) ។ 1. តើអ្វីជាការបន្ថែម (ឬបង់ដោយអតិថិជន) ។ 1. សុវត្ថិភាពការព្រមាន / ការប្រើប្រាស់។ 1. ការធានាប្រសិនបើមាន។ 1. ត្រឡប់គោលនយោបាយ។ 1. ល័ក្ខខ័ណ្ឌលើការដឹកជញ្ជូន, បើអនុវត្តបាន។ 1. វិធីនៃការដោះស្រាយវិវាទសំណងការទទួលខុសត្រូវជាដើម 1. អាសយដ្ឋាននិងទំនាក់ទំនងរបស់ក្រុមហ៊ុនរបស់អ្នក។"
 DocType: Homepage Section,Section Based On,ផ្នែកផ្អែកលើ។
+DocType: Shopping Cart Settings,Show Apply Coupon Code,បង្ហាញអនុវត្តលេខកូដគូប៉ុង
 DocType: Issue,Issue Type,ប្រភេទបញ្ហា
 DocType: Attendance,Leave Type,ប្រភេទការឈប់សម្រាក
 DocType: Purchase Invoice,Supplier Invoice Details,ក្រុមហ៊ុនផ្គត់ផ្គង់វិក័យប័ត្រលំអិត
 DocType: Agriculture Task,Ignore holidays,មិនអើពើថ្ងៃបុណ្យ
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,បន្ថែម / កែលក្ខខណ្ឌគូប៉ុង
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,គណនីក្នុងការចំណាយ / ភាពខុសគ្នា ({0}) ត្រូវតែជា &quot;ចំណញឬខាត &#39;គណនី
 DocType: Stock Entry Detail,Stock Entry Child,កូនក្មេងចូលស្តុក។
 DocType: Project,Copied From,ចម្លងពី
@@ -4636,6 +4654,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,លក្ខណៈវិនិច្ឆ័យការវាយតំលៃផែនការ
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,ប្រតិបត្តិការ
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ទប់ស្កាត់ការបញ្ជាទិញ
+DocType: Coupon Code,Coupon Name,ឈ្មោះគូប៉ុង
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,ងាយយល់
 DocType: Email Campaign,Scheduled,កំណត់ពេលវេលា
 DocType: Shift Type,Working Hours Calculation Based On,ការគណនាម៉ោងធ្វើការផ្អែកលើ។
@@ -4652,7 +4671,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,បង្កើតវ៉ារ្យ៉ង់
 DocType: Vehicle,Diesel,ម៉ាស៊ូត
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,រូបិយប័ណ្ណបញ្ជីតម្លៃមិនបានជ្រើសរើស
+DocType: Quick Stock Balance,Available Quantity,បរិមាណដែលអាចប្រើបាន
 DocType: Purchase Invoice,Availed ITC Cess,ផ្តល់ជូនដោយ ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ
 ,Student Monthly Attendance Sheet,សិស្សសន្លឹកអវត្តមានប្រចាំខែ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,ច្បាប់នៃការដឹកជញ្ជូនអាចអនុវត្តបានតែសម្រាប់លក់ប៉ុណ្ណោះ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទទិញបានទេ
@@ -4719,8 +4740,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
 DocType: Quality Meeting,Quality Meeting,ការប្រជុំគុណភាព។
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ដែលមិនមែនជាក្រុមដែលជាក្រុម
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ។
 DocType: Employee,ERPNext User,អ្នកប្រើ ERPNext
+DocType: Coupon Code,Coupon Description,ការពិពណ៌នាគូប៉ុង
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},បាច់គឺជាការចាំបាច់ក្នុងជួរ {0}
 DocType: Company,Default Buying Terms,ល័ក្ខខ័ណ្ឌនៃការទិញលំនាំដើម។
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,ធាតុបង្កាន់ដៃទិញសហការី
@@ -4882,6 +4903,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,ពត៌មានលំអិតរបស់ឯកសារគ្មានការប្រឆាំងនឹងការ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ការលុបមិនត្រូវបានអនុញ្ញាតសម្រាប់ប្រទេស {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,គណបក្សជាការចាំបាច់ប្រភេទ
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,អនុវត្តលេខកូដគូប៉ុង
 DocType: Quality Inspection,Outgoing,ចេញ
 DocType: Customer Feedback Table,Customer Feedback Table,តារាងមតិអតិថិជន។
 apps/erpnext/erpnext/config/support.py,Service Level Agreement.,កិច្ចព្រមព្រៀងកម្រិតសេវាកម្ម។
@@ -5031,7 +5053,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,នៅលើការដាក់ស្នើការបញ្ជាទិញ។
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,បន្ថែមអ្នកផ្គត់ផ្គង់ទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ជួរដេក # {0}: ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចច្រើនជាងចំនួនពូកែ។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី។
 DocType: Tally Migration,Parties,ពិធីជប់លៀង។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,រកមើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
@@ -5063,7 +5084,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},មិនអនុញ្ញាតឱ្យកំណត់ធាតុជំនួសសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),មានអាយ។ ស៊ី។ ធី។ ស៊ីដែលមាន (ក) - (ខ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,បង្កើតកម្រៃ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
@@ -5088,6 +5108,7 @@
 DocType: Quiz Result,Wrong,ខុស។
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួនទឹកប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
+DocType: Sales Partner,Referral Code,លេខកូដបង្អែក
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,ចំនួនទឹកប្រាក់សរុបជាមុនមិនអាចច្រើនជាងចំនួនសរុបដែលបានអនុញ្ញាត
 DocType: Salary Slip,Hour Rate,ហួរអត្រា
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,បើកការបញ្ជាទិញដោយស្វ័យប្រវត្តិ។
@@ -5239,6 +5260,7 @@
 DocType: Travel Request,Fully Sponsored,ឧបត្ថម្ភយ៉ាងពេញទំហឹង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,បញ្ច្រាសធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,បង្កើតកាតការងារ។
+DocType: Quotation,Referral Sales Partner,ដៃគូលក់ការបញ្ជូន
 DocType: Quality Procedure Process,Process Description,ការពិពណ៌នាអំពីដំណើរការ។
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,អតិថិជន {0} ត្រូវបានបង្កើត។
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,បច្ចុប្បន្នពុំមានស្តុកនៅក្នុងឃ្លាំងណាមួយឡើយ
@@ -5373,6 +5395,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,អត្រា Bom
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,កំពុងអានឯកសារដែលបានផ្ទុកឡើង។
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","បញ្ឈប់ការងារមិនអាចលុបចោលបានទេ, សូមបញ្ឈប់វាសិនមុននឹងលុបចោល"
+DocType: Coupon Code,Coupon Code,លេខកូដគូប៉ុង
 DocType: Asset,Journal Entry for Scrap,ទិនានុប្បវត្តិធាតុសម្រាប់សំណល់អេតចាយ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,សូមទាញធាតុពីការដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},ជួរដេក {0}: ជ្រើសកន្លែងធ្វើការប្រឆាំងនឹងប្រតិបត្តិការ {1}
@@ -5456,6 +5479,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;កាលបរិច្ឆេទ&#39; ត្រូវបានទាមទារ។
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",សូមទោសលេខកូដប័ណ្ណមានសុពលភាពផុតកំណត់
 DocType: Bank Account,Account Details,ព័ត៌មានអំពីគណនី
 DocType: Crop,Materials Required,សម្ភារៈដែលត្រូវការ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
@@ -5493,6 +5517,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,ទៅកាន់អ្នកប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,ចំនួនទឹកប្រាក់ដែលបង់ + + បិទសរសេរចំនួនទឹកប្រាក់ដែលមិនអាចត្រូវបានធំជាងសម្ពោធសរុប
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} គឺមិនមែនជាលេខបាច់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,សូមបញ្ចូលលេខកូដប័ណ្ណត្រឹមត្រូវ !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},ចំណាំ: មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Task,Task Description,ការពិពណ៌នាអំពីភារកិច្ច។
 DocType: Training Event,Seminar,សិក្ខាសាលា
@@ -5760,6 +5785,7 @@
 ,TDS Payable Monthly,TDS ត្រូវបង់ប្រចាំខែ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,ដាក់ជួរសម្រាប់ជំនួស BOM ។ វាអាចចំណាយពេលពីរបីនាទី។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,ការទូទាត់សរុប។
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
@@ -5850,6 +5876,7 @@
 DocType: Production Plan,Get Raw Materials For Production,ទទួលបានវត្ថុធាតុដើមសម្រាប់ផលិតកម្ម
 DocType: Job Opening,Job Title,ចំណងជើងការងារ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,ការទូទាត់សំណងអនាគត។
+DocType: Quotation,Additional Discount and Coupon Code,ការបញ្ចុះតម្លៃបន្ថែមនិងលេខកូដគូប៉ុង
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0} បង្ហាញថា {1} នឹងមិនផ្តល់សម្រង់ទេប៉ុន្តែធាតុទាំងអស់ត្រូវបានដកស្រង់។ ធ្វើបច្ចុប្បន្នភាពស្ថានភាពសម្រង់ RFQ ។
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,គំរូអតិបរមា - {0} ត្រូវបានរក្សាទុករួចហើយសម្រាប់បំណះ {1} និងធាតុ {2} នៅក្នុងបាច់ {3} ។
@@ -6076,7 +6103,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,ការកំណត់សម្រាប់គេហទំព័រគេហទំព័រ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} បានផ្អាករហូតដល់ {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQs មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0} ដោយសារតែពិន្ទុនៃពិន្ទុនៃ {1}
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,ធ្វើឱ្យការទិញវិក័យប័ត្រ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,ប្រើស្លឹក
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} គូប៉ុងដែលបានប្រើគឺ {1} ។ បរិមាណដែលបានអនុញ្ញាតគឺអស់ហើយ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,តើអ្នកចង់ដាក់សំណើសម្ភារៈទេ។
 DocType: Job Offer,Awaiting Response,រង់ចាំការឆ្លើយតប
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-yYYYY.-
@@ -6090,6 +6119,7 @@
 DocType: Training Event Employee,Optional,ស្រេចចិត្ត
 DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
 DocType: Agriculture Analysis Criteria,Water Analysis,ការវិភាគទឹក
+DocType: Sales Order,Skip Delivery Note,រំលងចំណាំដឹកជញ្ជូន
 DocType: Price List,Price Not UOM Dependent,តម្លៃមិនមែនយូអ៊ឹមពឹងផ្អែក។
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} បានបង្កើតវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,កិច្ចព្រមព្រៀងកម្រិតសេវាកម្មលំនាំដើមមានរួចហើយ។
@@ -6300,7 +6330,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទដែលអាចប្រើបាន
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក។
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,រទេះ
@@ -6396,6 +6425,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",ពិន្ទុស្មោះត្រង់នឹងត្រូវបានគណនាពីការចំណាយដែលបានចំណាយ (តាមរយៈវិក័យប័ត្រលក់) ផ្អែកលើកត្តាប្រមូលដែលបានលើកឡើង។
 DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
+DocType: Pricing Rule,Coupon Code Based,លេខកូដប័ណ្ណ
 DocType: Company,HRA Settings,ការកំណត់ HRA
 DocType: Homepage,Hero Section,ផ្នែកវីរៈបុរស។
 DocType: Employee Transfer,Transfer Date,កាលបរិច្ឆេទផ្ទេរ
@@ -6512,6 +6542,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',សូមកំណត់ក្រុមហ៊ុនត្រងនៅទទេប្រសិនបើក្រុមតាមគឺ &#39;ក្រុមហ៊ុន&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,ការប្រកាសកាលបរិច្ឆេទមិនអាចបរិច្ឆេទនាពេលអនាគត
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ជួរដេក # {0}: សៀរៀលគ្មាន {1} មិនផ្គូផ្គងនឹង {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង
 DocType: Stock Entry,Target Warehouse Address,អាស័យដ្ឋានឃ្លាំង
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,ចាកចេញធម្មតា
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ពេលវេលាមុនពេលវេនចាប់ផ្តើមផ្លាស់ប្តូរកំឡុងពេលដែលបុគ្គលិកចុះឈ្មោះចូលត្រូវបានពិចារណាសម្រាប់ការចូលរួម។
@@ -6546,7 +6577,6 @@
 DocType: Employee Grade,Employee Grade,ថ្នាក់និយោជិក
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ម៉ៅការ
 DocType: GSTR 3B Report,June,មិថុនា។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់។
 DocType: Share Balance,From No,ពីលេខ
 DocType: Shift Type,Early Exit Grace Period,រយៈពេលនៃការចាកចេញពីព្រះគុណមុនកាលកំណត់។
 DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
@@ -6969,6 +6999,7 @@
 DocType: Budget,Warn,ព្រមាន
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,មុខទំនិញអស់ត្រូវបានផ្ទេររួចហើយសម្រាប់ការកម្ម៉ង់នេះ។
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
+DocType: Bank Account,Company Account,គណនីក្រុមហ៊ុន
 DocType: Asset Maintenance,Manufacturing User,អ្នកប្រើប្រាស់កម្មន្តសាល
 DocType: Purchase Invoice,Raw Materials Supplied,វត្ថុធាតុដើមដែលសហការី
 DocType: Subscription Plan,Payment Plan,ផែនការទូទាត់
@@ -7010,6 +7041,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) មិនអាចធំជាងបរិមាណដែលបានគ្រោងទុក ({2}) ក្នុងលំដាប់ការងារ {3}
 DocType: Certification Application,Name of Applicant,ឈ្មោះរបស់បេក្ខជន
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,ពេលវេលាសម្រាប់ការផលិតសន្លឹក។
+DocType: Quick Stock Balance,Quick Stock Balance,សមតុល្យស្តុករហ័ស
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,សរុបរង
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,មិនអាចផ្លាស់ប្តូរលក្ខណសម្បត្តិវ៉ារ្យ៉ង់បន្ទាប់ពីប្រតិបត្តិការភាគហ៊ុន។ អ្នកនឹងត្រូវបង្កើតធាតុថ្មីដើម្បីធ្វើវា។
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,អាណត្តិ SEPC របស់ GoCardless
@@ -7337,6 +7369,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ជានិស្សិតអសកម្ម
 DocType: Employee,Health Details,ពត៌មានលំអិតសុខភាព
+DocType: Coupon Code,Coupon Type,ប្រភេទគូប៉ុង
 DocType: Leave Encashment,Encashable days,ថ្ងៃជាប់គ្នា
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,ដើម្បីបង្កើតសំណើទូទាត់ឯកសារសេចក្ដីយោងគឺត្រូវបានទាមទារ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,ដើម្បីបង្កើតសំណើទូទាត់ឯកសារសេចក្ដីយោងគឺត្រូវបានទាមទារ
@@ -7625,6 +7658,7 @@
 DocType: Hotel Room Package,Amenities,គ្រឿងបរិក្ខារ
 DocType: Accounts Settings,Automatically Fetch Payment Terms,ប្រមូលយកលក្ខខណ្ឌទូទាត់ដោយស្វ័យប្រវត្តិ។
 DocType: QuickBooks Migrator,Undeposited Funds Account,គណនីមូលនិធិដែលមិនបានរឹបអូស
+DocType: Coupon Code,Uses,ការប្រើប្រាស់
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,របៀបបង់ប្រាក់លំនាំដើមច្រើនមិនត្រូវបានអនុញ្ញាតទេ
 DocType: Sales Invoice,Loyalty Points Redemption,ពិន្ទុស្មោះត្រង់នឹងការប្រោសលោះ
 ,Appointment Analytics,វិភាគណាត់ជួប
@@ -7642,6 +7676,7 @@
 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","ប្រសិនបើបានធីកនោះទេសរុប។ នៃថ្ងៃធ្វើការនឹងរួមបញ្ចូលទាំងថ្ងៃឈប់សម្រាក, ហើយនេះនឹងកាត់បន្ថយតម្លៃនៃប្រាក់ខែក្នុងមួយថ្ងៃនោះ"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,បានបរាជ័យក្នុងការបន្ថែមដែន
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",ដើម្បីអនុញ្ញាតិអោយទទួលវិក័យប័ត្រ / ដឹកជញ្ជូនលើសកំណត់ធ្វើបច្ចុប្បន្នភាព“ លើវិក័យប័ត្រទទួលប្រាក់ឧបត្ថម្ភ / ការដឹកជញ្ជូន” នៅក្នុងការកំណត់ស្តុកឬធាតុ។
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?",កម្មវិធីដែលប្រើពាក្យគន្លឹះបច្ចុប្បន្ននឹងមិនអាចចូលដំណើរការបានទេតើអ្នកប្រាកដទេ?
 DocType: Subscription Settings,Prorate,Prorate
@@ -7655,6 +7690,7 @@
 ,BOM Stock Report,របាយការណ៍ស្តុករបស់ BOM
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group",ប្រសិនបើមិនមានពេលវេលាកំណត់ទេនោះការទំនាក់ទំនងនឹងត្រូវបានដោះស្រាយដោយក្រុមនេះ។
 DocType: Stock Reconciliation Item,Quantity Difference,ភាពខុសគ្នាបរិមាណ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
 ,Electronic Invoice Register,ចុះឈ្មោះវិក្កយបត្រអេឡិចត្រូនិក។
@@ -7909,6 +7945,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ពន្ធនិងការចោទប្រកាន់កាត់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Item Group,General Settings,ការកំណត់ទូទៅ
 DocType: Article,Article,មាត្រា
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,សូមបញ្ចូលលេខកូដប័ណ្ណ !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ចាប់ពីរូបិយវត្ថុនិងដើម្បីរូបិយវត្ថុមិនអាចជាដូចគ្នា
 DocType: Taxable Salary Slab,Percent Deduction,ការកាត់បន្ថយភាគរយ
 DocType: GL Entry,To Rename,ដើម្បីប្តូរឈ្មោះ។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index b68eb65..1673c16 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT -YYYY.-
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 DocType: Shift Type,Enable Auto Attendance,ಸ್ವಯಂ ಹಾಜರಾತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,ದಯವಿಟ್ಟು ಗೋದಾಮು ಮತ್ತು ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ
 DocType: Lost Reason Detail,Opportunity Lost Reason,ಅವಕಾಶ ಕಳೆದುಹೋದ ಕಾರಣ
 DocType: Patient Appointment,Check availability,ಲಭ್ಯವಿದೆಯೇ
 DocType: Retention Bonus,Bonus Payment Date,ಬೋನಸ್ ಪಾವತಿ ದಿನಾಂಕ
@@ -260,6 +261,7 @@
 ,Completed Work Orders,ಕೆಲಸ ಆದೇಶಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗಿದೆ
 DocType: Support Settings,Forum Posts,ವೇದಿಕೆ ಪೋಸ್ಟ್ಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","ಕಾರ್ಯವನ್ನು ಹಿನ್ನೆಲೆ ಕೆಲಸವೆಂದು ಎನ್ಕ್ಯೂ ಮಾಡಲಾಗಿದೆ. ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸುವಲ್ಲಿ ಯಾವುದೇ ಸಮಸ್ಯೆ ಇದ್ದಲ್ಲಿ, ಸಿಸ್ಟಮ್ ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯದಲ್ಲಿನ ದೋಷದ ಬಗ್ಗೆ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಸೇರಿಸುತ್ತದೆ ಮತ್ತು ಡ್ರಾಫ್ಟ್ ಹಂತಕ್ಕೆ ಹಿಂತಿರುಗುತ್ತದೆ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","ಕ್ಷಮಿಸಿ, ಕೂಪನ್ ಕೋಡ್ ಸಿಂಧುತ್ವ ಪ್ರಾರಂಭವಾಗಿಲ್ಲ"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,ತೆರಿಗೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: Leave Policy,Leave Policy Details,ಪಾಲಿಸಿ ವಿವರಗಳನ್ನು ಬಿಡಿ
@@ -324,6 +326,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Student,B-,ಬಿ
 DocType: Assessment Result,Grade,ಗ್ರೇಡ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 DocType: Restaurant Table,No of Seats,ಆಸನಗಳ ಸಂಖ್ಯೆ
 DocType: Sales Invoice,Overdue and Discounted,ಮಿತಿಮೀರಿದ ಮತ್ತು ರಿಯಾಯಿತಿ
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,ಕರೆ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ
@@ -500,6 +503,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,ಪದಗಳಲ್ಲಿ ಪ್ರಮಾಣದ ಸಾಲಿನ ಅಂತರ
 DocType: Vehicle,Additional Details,ಹೆಚ್ಚುವರಿ ವಿವರಗಳು
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,ಯಾವುದೇ ವಿವರಣೆ givenName
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,ಗೋದಾಮಿನಿಂದ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,ಖರೀದಿ ವಿನಂತಿ .
 DocType: POS Closing Voucher Details,Collected Amount,ಸಂಗ್ರಹಿಸಿದ ಮೊತ್ತ
 DocType: Lab Test,Submitted Date,ಸಲ್ಲಿಸಿದ ದಿನಾಂಕ
@@ -607,6 +611,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,ಕಲಿಯಿರಿ
 ,Trial Balance (Simple),ಪ್ರಯೋಗ ಸಮತೋಲನ (ಸರಳ)
 DocType: Purchase Invoice Item,Enable Deferred Expense,ಮುಂದೂಡಲ್ಪಟ್ಟ ಖರ್ಚು ಸಕ್ರಿಯಗೊಳಿಸಿ
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,ಅನ್ವಯಿಕ ಕೂಪನ್ ಕೋಡ್
 DocType: Asset,Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,ನೌಕರರ ಚಟುವಟಿಕೆಗಳನ್ನು ವೆಚ್ಚ
 DocType: Accounts Settings,Settings for Accounts,ಖಾತೆಗಳಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು
@@ -842,8 +847,6 @@
 DocType: Sales Invoice,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ಮೇಲ್
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ಮೇಲ್
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ದಯವಿಟ್ಟು ನೌಕರ <a href=""#Form/Employee/{0}"">{0}</a> delete ಅನ್ನು ಅಳಿಸಿ"
 DocType: Item,Show in Website (Variant),ವೆಬ್ಸೈಟ್ ತೋರಿಸಿ (variant)
 DocType: Employee,Health Concerns,ಆರೋಗ್ಯ ಕಾಳಜಿ
 DocType: Payroll Entry,Select Payroll Period,ವೇತನದಾರರ ಅವಧಿಯ ಆಯ್ಕೆ
@@ -1006,6 +1009,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,ತೆರಿಗೆ ತಡೆಹಿಡಿಯುವ ಖಾತೆ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ಗಳು.
+DocType: Coupon Code,To be used to get discount,ರಿಯಾಯಿತಿ ಪಡೆಯಲು ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Buying Settings,Purchase Receipt Required,ಅಗತ್ಯ ಖರೀದಿ ರಸೀತಿ
 DocType: Sales Invoice,Rail,ರೈಲು
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ವಾಸ್ತವಿಕ ವೆಚ್ಚ
@@ -1053,6 +1057,7 @@
 DocType: Production Plan,Production Plan,ಉತ್ಪಾದನಾ ಯೋಜನೆ
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,ಸರಕುಪಟ್ಟಿ ಸೃಷ್ಟಿ ಉಪಕರಣವನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ
 DocType: Salary Component,Round to the Nearest Integer,ಹತ್ತಿರದ ಪೂರ್ಣಾಂಕಕ್ಕೆ ಸುತ್ತಿಕೊಳ್ಳಿ
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,ಸ್ಟಾಕ್‌ನಲ್ಲಿರದ ವಸ್ತುಗಳನ್ನು ಕಾರ್ಟ್‌ಗೆ ಸೇರಿಸಲು ಅನುಮತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,ಸೀರಿಯಲ್ ನೋ ಇನ್ಪುಟ್ ಆಧರಿಸಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ನಲ್ಲಿ ಹೊಂದಿಸಿ
 ,Total Stock Summary,ಒಟ್ಟು ಸ್ಟಾಕ್ ಸಾರಾಂಶ
@@ -1182,6 +1187,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),ಬೇಸ್ ಅವರ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 ,Qty To Be Billed,ಬಿಲ್ ಮಾಡಲು ಬಿಟಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
+DocType: Coupon Code,Gift Card,ಉಡುಗೊರೆ ಪತ್ರ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ಉತ್ಪಾದನೆಗೆ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ: ಉತ್ಪಾದನಾ ವಸ್ತುಗಳನ್ನು ತಯಾರಿಸಲು ಕಚ್ಚಾ ವಸ್ತುಗಳ ಪ್ರಮಾಣ.
 DocType: Loyalty Point Entry Redemption,Redemption Date,ರಿಡೆಂಪ್ಶನ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,ಈ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರವು ಈಗಾಗಲೇ ಸಂಪೂರ್ಣವಾಗಿ ಹೊಂದಾಣಿಕೆ ಆಗಿದೆ
@@ -1270,6 +1276,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,ಟೈಮ್‌ಶೀಟ್ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ಖರೀದಿಸಿ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,ನಿಮ್ಮ ಸದಸ್ಯತ್ವ 30 ದಿನಗಳಲ್ಲಿ ಅವಧಿ ಮೀರಿದರೆ ಮಾತ್ರ ನೀವು ನವೀಕರಿಸಬಹುದು
 DocType: Shopping Cart Settings,Show Stock Availability,ಸ್ಟಾಕ್ ಲಭ್ಯತೆ ತೋರಿಸಿ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},ಆಸ್ತಿ ವರ್ಗದ {1} ಅಥವಾ ಕಂಪನಿಯಲ್ಲಿ {0} ಹೊಂದಿಸಿ {2}
@@ -1565,7 +1572,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ: ಪ್ರಮಾಣ ಮಾರಾಟ ಆದೇಶ , ಆದರೆ ಈಡೇರಿಸಿಲ್ಲ ."
 DocType: Drug Prescription,Interval UOM,ಮಧ್ಯಂತರ UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save","ಆಯ್ಕೆ ಮಾಡಿದ ವಿಳಾಸವನ್ನು ಉಳಿಸಿದ ನಂತರ ಸಂಪಾದಿಸಿದ್ದರೆ, ಆಯ್ಕೆ ರದ್ದುಮಾಡಿ"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,ಉಪಗುತ್ತಿಗೆಗಾಗಿ ಕ್ಯೂಟಿ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ: ಉಪಕೋಟ್ರಾಕ್ಟ್ ವಸ್ತುಗಳನ್ನು ತಯಾರಿಸಲು ಕಚ್ಚಾ ವಸ್ತುಗಳ ಪ್ರಮಾಣ.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,ಉಪಗುತ್ತಿಗೆಗಾಗಿ ಕ್ಯೂಟಿ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ: ಉಪಕೋಟ್ರಾಕ್ಟ್ ವಸ್ತುಗಳನ್ನು ತಯಾರಿಸಲು ಕಚ್ಚಾ ವಸ್ತುಗಳ ಪ್ರಮಾಣ.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Item,Hub Publishing Details,ಹಬ್ ಪಬ್ಲಿಷಿಂಗ್ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
@@ -1827,6 +1834,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,ಐಟಂಗಳು ಮತ್ತು UOM ಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ
 DocType: Repayment Schedule,Balance Loan Amount,ಬ್ಯಾಲೆನ್ಸ್ ಸಾಲದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,ವಿವರಗಳಿಗೆ ಸೇರಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","ಕ್ಷಮಿಸಿ, ಕೂಪನ್ ಕೋಡ್ ಖಾಲಿಯಾಗಿದೆ"
 DocType: Communication Medium,Catch All,ಎಲ್ಲವನ್ನೂ ಕ್ಯಾಚ್ ಮಾಡಿ
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,ವೇಳಾಪಟ್ಟಿ ಕೋರ್ಸ್
 DocType: Budget,Applicable on Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
@@ -1974,6 +1982,7 @@
 DocType: Company,Parent Company,ಮೂಲ ಕಂಪನಿ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Hotel Rooms of type {0} are unavailable on {1},ಹೋಟೆಲ್ ಕೊಠಡಿಗಳು {0} {1} ನಲ್ಲಿ ಲಭ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/config/manufacturing.py,Compare BOMs for changes in Raw Materials and Operations,ಕಚ್ಚಾ ವಸ್ತುಗಳು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳಲ್ಲಿನ ಬದಲಾವಣೆಗಳಿಗಾಗಿ BOM ಗಳನ್ನು ಹೋಲಿಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/bank_transaction/bank_transaction.js,Document {0} successfully uncleared,ಡಾಕ್ಯುಮೆಂಟ್ {0} ಯಶಸ್ವಿಯಾಗಿ ಅಸ್ಪಷ್ಟವಾಗಿದೆ
 DocType: Healthcare Practitioner,Default Currency,ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js,Reconcile this account,ಈ ಖಾತೆಯನ್ನು ಮರುಸಂಗ್ರಹಿಸಿ
 apps/erpnext/erpnext/controllers/selling_controller.py,Maximum discount for Item {0} is {1}%,ಐಟಂ {0} ಗೆ ಗರಿಷ್ಠ ರಿಯಾಯಿತಿ {1}%
@@ -1993,6 +2002,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,ಇಮೇಲ್ ಪ್ರಚಾರಗಳು
+DocType: Sales Partner,To Track inbound purchase,ಒಳಬರುವ ಖರೀದಿಯನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಲು
 DocType: Buying Settings,Default Supplier Group,ಡೀಫಾಲ್ಟ್ ಪೂರೈಕೆದಾರ ಗುಂಪು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},ಪ್ರಮಾಣ ಕಡಿಮೆ ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},{0} ಅಂಶಕ್ಕೆ ಅರ್ಹವಾದ ಗರಿಷ್ಠ ಮೊತ್ತವು {1} ಮೀರಿದೆ
@@ -2146,7 +2156,6 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Hotel Room Reservation,Hotel Reservation User,ಹೋಟೆಲ್ ಮೀಸಲಾತಿ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ಸ್ಥಿತಿಯನ್ನು ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Contract,Fulfilment Deadline,ಪೂರೈಸುವ ಗಡುವು
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,ನಿನ್ನ ಹತ್ತಿರ
@@ -2270,6 +2279,7 @@
 DocType: Quality Meeting Table,Under Review,ಪರಿಶೀಲನೆಯಲ್ಲಿದೆ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,ಲಾಗಿನ್ ಮಾಡಲು ವಿಫಲವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,ಆಸ್ತಿ {0} ರಚಿಸಲಾಗಿದೆ
+DocType: Coupon Code,Promotional,ಪ್ರಚಾರ
 DocType: Special Test Items,Special Test Items,ವಿಶೇಷ ಪರೀಕ್ಷಾ ಐಟಂಗಳು
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Marketplace ನಲ್ಲಿ ನೋಂದಾಯಿಸಲು ನೀವು ಸಿಸ್ಟಮ್ ಮ್ಯಾನೇಜರ್ ಮತ್ತು ಐಟಂ ಮ್ಯಾನೇಜರ್ ರೋಲ್ಗಳೊಂದಿಗೆ ಬಳಕೆದಾರರಾಗಿರಬೇಕಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/config/buying.py,Key Reports,ಪ್ರಮುಖ ವರದಿಗಳು
@@ -2307,6 +2317,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,ಡಾಕ್ ಪ್ರಕಾರ
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
 DocType: Subscription Plan,Billing Interval Count,ಬಿಲ್ಲಿಂಗ್ ಇಂಟರ್ವಲ್ ಕೌಂಟ್
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಅನ್ನು ರದ್ದುಗೊಳಿಸಲು ದಯವಿಟ್ಟು ನೌಕರ <a href=""#Form/Employee/{0}"">{0}</a> delete ಅನ್ನು ಅಳಿಸಿ"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,ನೇಮಕಾತಿಗಳು ಮತ್ತು ರೋಗಿಯ ಎನ್ಕೌಂಟರ್ಸ್
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,ಮೌಲ್ಯವು ಕಾಣೆಯಾಗಿದೆ
 DocType: Employee,Department and Grade,ಇಲಾಖೆ ಮತ್ತು ಗ್ರೇಡ್
@@ -2407,6 +2419,7 @@
 DocType: Project,Start and End Dates,ಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ದಿನಾಂಕ ಎಂಡ್
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,ಕಾಂಟ್ರಾಕ್ಟ್ ಟೆಂಪ್ಲೇಟು ಪೂರೈಸುವ ನಿಯಮಗಳು
 ,Delivered Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ವಿತರಿಸಲಾಯಿತು ಐಟಂಗಳು
+DocType: Coupon Code,Maximum Use,ಗರಿಷ್ಠ ಬಳಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},ಓಪನ್ ಬಿಒಎಮ್ {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,ವೇರ್ಹೌಸ್ ನೆಯ ಬದಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Authorization Rule,Average Discount,ಸರಾಸರಿ ರಿಯಾಯಿತಿ
@@ -2567,6 +2580,7 @@
 DocType: Item,Inventory,ತಪಶೀಲು ಪಟ್ಟಿ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Json ಆಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
+DocType: Coupon Code,Used,ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',&#39;{0}&#39; ಅಭಿಯಾನವು ಈಗಾಗಲೇ {1} &#39;{2}&#39; ಗೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Asset Maintenance,Maintenance Team,ನಿರ್ವಹಣೆ ತಂಡ
@@ -2694,7 +2708,7 @@
 						Serial No cannot be ensured",ಐಟಂ {0} ಗಾಗಿ ಸಕ್ರಿಯ BOM ಕಂಡುಬಂದಿಲ್ಲ. \ ಸೀರಿಯಲ್ ನ ಮೂಲಕ ವಿತರಣೆ ಖಾತ್ರಿಪಡಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 DocType: Loan Type,Maximum Loan Amount,ಗರಿಷ್ಠ ಸಾಲದ
-DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
+DocType: Coupon Code,Pricing Rule,ಬೆಲೆ ರೂಲ್
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
@@ -2772,6 +2786,7 @@
 DocType: Payment Schedule,Payment Amount,ಪಾವತಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,ಹಾಫ್ ಡೇ ದಿನಾಂಕವು ದಿನಾಂಕ ಮತ್ತು ಕೆಲಸದ ಕೊನೆಯ ದಿನಾಂಕದಿಂದ ಕೆಲಸದ ನಡುವೆ ಇರಬೇಕು
 DocType: Healthcare Settings,Healthcare Service Items,ಆರೋಗ್ಯ ಸೇವೆ ವಸ್ತುಗಳು
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,ಅಮಾನ್ಯ ಬಾರ್‌ಕೋಡ್. ಈ ಬಾರ್‌ಕೋಡ್‌ಗೆ ಯಾವುದೇ ಐಟಂ ಲಗತ್ತಿಸಲಾಗಿಲ್ಲ.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Assessment Plan,Grading Scale,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
@@ -2891,7 +2906,6 @@
 DocType: Share Transfer,Asset Account,ಆಸ್ತಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,ಹೊಸ ಬಿಡುಗಡೆ ದಿನಾಂಕ ಭವಿಷ್ಯದಲ್ಲಿರಬೇಕು
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Lab Test,Technician Name,ತಂತ್ರಜ್ಞ ಹೆಸರು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3172,7 +3186,6 @@
 DocType: Student,Student Mobile Number,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
 DocType: Employee Benefit Claim,Claim Benefit For,ಕ್ಲೈಮ್ ಲಾಭ
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","{2} ಕ್ಕಿಂತ ಹೆಚ್ಚು {1} ಸಾಲಿನಲ್ಲಿ ಐಟಂ {0} ಗಾಗಿ ಓವರ್ಬಲ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಧಿಕ ಬಿಲ್ಲಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲು, ದಯವಿಟ್ಟು ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹೊಂದಿಸಿ"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,ಅಪ್ಡೇಟ್ ಪ್ರತಿಕ್ರಿಯೆ
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
@@ -3460,6 +3473,7 @@
 DocType: Vehicle,Fuel Type,ಇಂಧನ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,ಕಂಪನಿ ಕರೆನ್ಸಿ ಸೂಚಿಸಿ
 DocType: Workstation,Wages per hour,ಗಂಟೆಗೆ ವೇತನ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
@@ -3793,6 +3807,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,ಹೋಲ್ಡ್ ಆನ್
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,ಒಂದು ಕ್ವಾಶನ್ ಕನಿಷ್ಠ ಒಂದು ಸರಿಯಾದ ಆಯ್ಕೆಗಳನ್ನು ಹೊಂದಿರಬೇಕು
+apps/erpnext/erpnext/hooks.py,Purchase Orders,ಖರೀದಿ ಆದೇಶ
 DocType: Account,Inter Company Account,ಇಂಟರ್ ಕಂಪನಿ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,ದೊಡ್ಡ ಆಮದು
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
@@ -3803,6 +3818,7 @@
 DocType: POS Profile,[Select],[ ಆರಿಸಿರಿ ]
 DocType: Staffing Plan Detail,Number Of Positions,ಸ್ಥಾನಗಳ ಸಂಖ್ಯೆ
 DocType: Vital Signs,Blood Pressure (diastolic),ರಕ್ತದೊತ್ತಡ (ಡಯಾಸ್ಟೊಲಿಕ್)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 DocType: Agriculture Task,Holiday Management,ರಜಾದಿನದ ನಿರ್ವಹಣೆ
 DocType: Payment Request,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
@@ -4009,7 +4025,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Subscription,Trialling,ಟ್ರಯಲಿಂಗ್
 DocType: Sales Invoice Item,Deferred Revenue,ಮುಂದೂಡಲ್ಪಟ್ಟ ಆದಾಯ
-DocType: Bank Account,GL Account,ಜಿಎಲ್ ಖಾತೆ
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,ಸೇಲ್ಸ್ ಸರಕುಪಟ್ಟಿ ರಚನೆಗೆ ನಗದು ಖಾತೆಯನ್ನು ಬಳಸಲಾಗುತ್ತದೆ
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,ವಿನಾಯಿತಿ ಉಪ ವರ್ಗ
 DocType: Member,Membership Expiry Date,ಸದಸ್ಯತ್ವ ಮುಕ್ತಾಯ ದಿನಾಂಕ
@@ -4429,13 +4444,13 @@
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
 DocType: Pricing Rule,Apply Rule On Item Code,ಐಟಂ ಕೋಡ್‌ನಲ್ಲಿ ನಿಯಮವನ್ನು ಅನ್ವಯಿಸಿ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್ ವರದಿ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,ಶುಲ್ಕ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,ಸಂಚಿತ ಮೊತ್ತವನ್ನು ತೋರಿಸಿ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,ನವೀಕರಣ ಪ್ರಗತಿಯಲ್ಲಿದೆ. ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
 DocType: Production Plan Item,Produced Qty,ನಿರ್ಮಾಣದ ಕ್ಯೂಟಿ
 DocType: Vehicle Log,Fuel Qty,ಇಂಧನ ಪ್ರಮಾಣ
-DocType: Stock Entry,Target Warehouse Name,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Work Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
 DocType: Course,Assessment,ಅಸೆಸ್ಮೆಂಟ್
 DocType: Payment Entry Reference,Allocated,ಹಂಚಿಕೆ
@@ -4513,10 +4528,12 @@
  1. ಇತ್ಯಾದಿ ವಿಳಾಸ ವಿವಾದಗಳು, ನಷ್ಟ, ಹೊಣೆಗಾರಿಕೆ, 
  1 ಮಾರ್ಗಗಳು. ವಿಳಾಸ ಮತ್ತು ನಿಮ್ಮ ಕಂಪನಿ ಸಂಪರ್ಕಿಸಿ."
 DocType: Homepage Section,Section Based On,ವಿಭಾಗ ಆಧಾರಿತ
+DocType: Shopping Cart Settings,Show Apply Coupon Code,ಅನ್ವಯಿಸು ಕೂಪನ್ ಕೋಡ್ ತೋರಿಸಿ
 DocType: Issue,Issue Type,ಸಂಚಿಕೆ ಪ್ರಕಾರ
 DocType: Attendance,Leave Type,ಪ್ರಕಾರ ಬಿಡಿ
 DocType: Purchase Invoice,Supplier Invoice Details,ಸರಬರಾಜುದಾರ ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
 DocType: Agriculture Task,Ignore holidays,ರಜಾದಿನಗಳನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,ಕೂಪನ್ ಷರತ್ತುಗಳನ್ನು ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,ಖರ್ಚು / ವ್ಯತ್ಯಾಸ ಖಾತೆ ({0}) ಒಂದು 'ಲಾಭ ಅಥವಾ ನಷ್ಟ' ಖಾತೆ ಇರಬೇಕು
 DocType: Stock Entry Detail,Stock Entry Child,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಚೈಲ್ಡ್
 DocType: Project,Copied From,ನಕಲು
@@ -4687,6 +4704,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ ಮಾನದಂಡ
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ತಡೆಯಿರಿ
+DocType: Coupon Code,Coupon Name,ಕೂಪನ್ ಹೆಸರು
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,ಒಳಗಾಗಬಹುದು
 DocType: Email Campaign,Scheduled,ಪರಿಶಿಷ್ಟ
 DocType: Shift Type,Working Hours Calculation Based On,ಕೆಲಸದ ಸಮಯದ ಲೆಕ್ಕಾಚಾರವನ್ನು ಆಧರಿಸಿದೆ
@@ -4703,7 +4721,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,ಮಾರ್ಪಾಟುಗಳು ರಚಿಸಿ
 DocType: Vehicle,Diesel,ಡೀಸೆಲ್
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ಆಯ್ಕೆ ಇಲ್ಲ
+DocType: Quick Stock Balance,Available Quantity,ಲಭ್ಯವಿರುವ ಪ್ರಮಾಣ
 DocType: Purchase Invoice,Availed ITC Cess,ಐಟಿಸಿ ಸೆಸ್ ಪಡೆದುಕೊಂಡಿದೆ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 ,Student Monthly Attendance Sheet,ವಿದ್ಯಾರ್ಥಿ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ಶೀಟ್
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,ಶಿಪ್ಪಿಂಗ್ ನಿಯಮವು ಮಾರಾಟಕ್ಕೆ ಮಾತ್ರ ಅನ್ವಯಿಸುತ್ತದೆ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿಯ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
@@ -4772,6 +4792,7 @@
 DocType: Quality Meeting,Quality Meeting,ಗುಣಮಟ್ಟದ ಸಭೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ಗ್ರೂಪ್ ಅಲ್ಲದ ಗ್ರೂಪ್
 DocType: Employee,ERPNext User,ERPNext ಬಳಕೆದಾರ
+DocType: Coupon Code,Coupon Description,ಕೂಪನ್ ವಿವರಣೆ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},ಬ್ಯಾಚ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},ಬ್ಯಾಚ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 DocType: Company,Default Buying Terms,ಡೀಫಾಲ್ಟ್ ಖರೀದಿ ನಿಯಮಗಳು
@@ -4933,6 +4954,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,ಡಾಕ್ಯುಮೆಂಟ್ ವಿವರ ವಿರುದ್ಧ ನಂ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ದೇಶಕ್ಕಾಗಿ {0} ಅಳಿಸುವಿಕೆಗೆ ಅನುಮತಿ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,ಕೂಪನ್ ಕೋಡ್ ಅನ್ನು ಅನ್ವಯಿಸಿ
 DocType: Quality Inspection,Outgoing,ನಿರ್ಗಮಿಸುವ
 DocType: Customer Feedback Table,Customer Feedback Table,ಗ್ರಾಹಕ ಪ್ರತಿಕ್ರಿಯೆ ಕೋಷ್ಟಕ
 apps/erpnext/erpnext/config/support.py,Service Level Agreement.,ಸೇವೆ ಮಟ್ಟದ ಒಪ್ಪಂದ.
@@ -5083,7 +5105,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ಖರೀದಿ ಆದೇಶ ಸಲ್ಲಿಕೆಗೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ರೋ # {0}: ನಿಗದಿ ಪ್ರಮಾಣ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Tally Migration,Parties,ಪಕ್ಷಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
@@ -5114,7 +5135,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ಐಟಂ {0} ಗಾಗಿ ಪರ್ಯಾಯ ಐಟಂ ಅನ್ನು ಹೊಂದಿಸಲು ಅನುಮತಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ನೆಟ್ ಐಟಿಸಿ ಲಭ್ಯವಿದೆ (ಎ) - (ಬಿ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ಶುಲ್ಕಗಳು ರಚಿಸಿ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
@@ -5138,6 +5158,7 @@
 DocType: Quiz Result,Wrong,ತಪ್ಪಾಗಿದೆ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
+DocType: Sales Partner,Referral Code,ರೆಫರಲ್ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,ಒಟ್ಟು ಮುಂಗಡ ಮೊತ್ತವು ಒಟ್ಟು ಮಂಜೂರು ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರುವುದಿಲ್ಲ
 DocType: Salary Slip,Hour Rate,ಅವರ್ ದರ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,ಸ್ವಯಂ ಮರು-ಆದೇಶವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
@@ -5266,6 +5287,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},ದಯವಿಟ್ಟು ಐಟಂನ ವಿರುದ್ಧ BOM ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: Shopping Cart Settings,Show Stock Quantity,ಸ್ಟಾಕ್ ಪ್ರಮಾಣವನ್ನು ತೋರಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,ಕಾರ್ಯಾಚರಣೆ ನಿವ್ವಳ ನಗದು
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ಐಟಂಗೆ UOM ಪರಿವರ್ತನೆ ಅಂಶ ({0} -&gt; {1}) ಕಂಡುಬಂದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,ಐಟಂ 4
 DocType: Student Admission,Admission End Date,ಪ್ರವೇಶ ಮುಕ್ತಾಯ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,ಒಳ-ಒಪ್ಪಂದ
@@ -5288,6 +5310,7 @@
 DocType: Travel Request,Fully Sponsored,ಸಂಪೂರ್ಣವಾಗಿ ಪ್ರಾಯೋಜಿತ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,ರಿವರ್ಸ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,ಜಾಬ್ ಕಾರ್ಡ್ ರಚಿಸಿ
+DocType: Quotation,Referral Sales Partner,ರೆಫರಲ್ ಮಾರಾಟ ಪಾಲುದಾರ
 DocType: Quality Procedure Process,Process Description,ಪ್ರಕ್ರಿಯೆಯ ವಿವರಣೆ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,ಗ್ರಾಹಕ {0} ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,ಪ್ರಸ್ತುತ ಯಾವುದೇ ವೇರಾಹೌಸ್‌ನಲ್ಲಿ ಸ್ಟಾಕ್ ಲಭ್ಯವಿಲ್ಲ
@@ -5419,6 +5442,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,ಬಿಒಎಮ್ ದರ
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,ಅಪ್‌ಲೋಡ್ ಮಾಡಿದ ಫೈಲ್ ಅನ್ನು ಓದುವುದು
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿರುವ ಕೆಲಸ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ, ಅನ್ಸ್ಟಪ್ ಅದನ್ನು ಮೊದಲು ರದ್ದುಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"
+DocType: Coupon Code,Coupon Code,ಕೂಪನ್ ಕೋಡ್
 DocType: Asset,Journal Entry for Scrap,ಸ್ಕ್ರ್ಯಾಪ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಐಟಂಗಳನ್ನು ಪುಲ್ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},ಸಾಲು {0}: ಕಾರ್ಯಾಚರಣೆ ವಿರುದ್ಧ ಕಾರ್ಯಕ್ಷೇತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ {1}
@@ -5502,6 +5526,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;ದಿನಾಂಕ&#39; ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","ಕ್ಷಮಿಸಿ, ಕೂಪನ್ ಕೋಡ್ ಸಿಂಧುತ್ವ ಅವಧಿ ಮೀರಿದೆ"
 DocType: Bank Account,Account Details,ಖಾತೆ ವಿವರಗಳು
 DocType: Crop,Materials Required,ಸಾಮಗ್ರಿಗಳು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
@@ -5539,6 +5564,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,ಬಳಕೆದಾರರಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,ಪಾವತಿಸಿದ ಪ್ರಮಾಣದ + ಆಫ್ ಬರೆಯಿರಿ ಪ್ರಮಾಣ ಹೆಚ್ಚಿನ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} ಐಟಂ ಮಾನ್ಯ ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಅಲ್ಲ {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,ದಯವಿಟ್ಟು ಮಾನ್ಯ ಕೂಪನ್ ಕೋಡ್ ನಮೂದಿಸಿ !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},ಗಮನಿಸಿ : ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Task,Task Description,ಕಾರ್ಯ ವಿವರಣೆ
 DocType: Training Event,Seminar,ಸೆಮಿನಾರ್
@@ -5805,6 +5831,7 @@
 ,TDS Payable Monthly,ಟಿಡಿಎಸ್ ಪಾವತಿಸಬಹುದಾದ ಮಾಸಿಕ
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,BOM ಅನ್ನು ಬದಲಿಸಲು ಸರದಿಯಲ್ಲಿದೆ. ಇದು ಕೆಲವು ನಿಮಿಷಗಳನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,ಒಟ್ಟು ಪಾವತಿಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಸೀರಿಯಲ್ ಸೂಲ ಅಗತ್ಯವಿದೆ {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
@@ -5892,6 +5919,7 @@
 DocType: Production Plan,Get Raw Materials For Production,ಉತ್ಪಾದನೆಗೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಪಡೆಯಿರಿ
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,ಭವಿಷ್ಯದ ಪಾವತಿ ರೆಫ್
+DocType: Quotation,Additional Discount and Coupon Code,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಮತ್ತು ಕೂಪನ್ ಕೋಡ್
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} {1} ಉದ್ಧರಣವನ್ನು ಒದಗಿಸುವುದಿಲ್ಲ ಎಂದು ಸೂಚಿಸುತ್ತದೆ, ಆದರೆ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ. RFQ ಉಲ್ಲೇಖ ಸ್ಥಿತಿಯನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,ಗರಿಷ್ಠ ಸ್ಯಾಂಪಲ್ಸ್ - ಬ್ಯಾಚ್ {3} ನಲ್ಲಿ ಬ್ಯಾಚ್ {1} ಮತ್ತು ಐಟಂ {2} ಗಾಗಿ {0} ಈಗಾಗಲೇ ಉಳಿಸಿಕೊಂಡಿವೆ.
@@ -6118,6 +6146,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,ವೆಬ್ಸೈಟ್ ಮುಖಪುಟ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} {1} ವರೆಗೆ ಹಿಡಿದಿರುತ್ತದೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},{1} ರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ನಿಂತಿರುವ ಕಾರಣದಿಂದ {0} RFQ ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,ಉಪಯೋಗಿಸಿದ ಎಲೆಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸಲ್ಲಿಸಲು ನೀವು ಬಯಸುವಿರಾ
 DocType: Job Offer,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
@@ -6132,6 +6161,7 @@
 DocType: Training Event Employee,Optional,ಐಚ್ಛಿಕ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 DocType: Agriculture Analysis Criteria,Water Analysis,ನೀರಿನ ವಿಶ್ಲೇಷಣೆ
+DocType: Sales Order,Skip Delivery Note,ವಿತರಣಾ ಟಿಪ್ಪಣಿ ಬಿಟ್ಟುಬಿಡಿ
 DocType: Price List,Price Not UOM Dependent,ಬೆಲೆ UOM ಅವಲಂಬಿತವಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,{0} ರೂಪಾಂತರಗಳು ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,ಡೀಫಾಲ್ಟ್ ಸೇವಾ ಮಟ್ಟದ ಒಪ್ಪಂದವು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.
@@ -6339,7 +6369,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಲಭ್ಯವಾಗುವ ದಿನಾಂಕದ ಮೊದಲು ಇರಬಾರದು
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ಕಾರ್ಟ್
@@ -6435,6 +6464,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",ಪ್ರಸ್ತಾಪಿಸಲಾದ ಸಂಗ್ರಹ ಅಂಶದ ಆಧಾರದ ಮೇಲೆ ಖರ್ಚು ಮಾಡಿದ (ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ) ನಿಷ್ಠೆ ಪಾಯಿಂಟುಗಳನ್ನು ಲೆಕ್ಕಹಾಕಲಾಗುತ್ತದೆ.
 DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
+DocType: Pricing Rule,Coupon Code Based,ಕೂಪನ್ ಕೋಡ್ ಆಧಾರಿತ
 DocType: Company,HRA Settings,HRA ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Homepage,Hero Section,ಹೀರೋ ವಿಭಾಗ
 DocType: Employee Transfer,Transfer Date,ವರ್ಗಾವಣೆ ದಿನಾಂಕ
@@ -6549,6 +6579,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',ಕಂಪನಿ ಖಾಲಿ ಫಿಲ್ಟರ್ ಸೆಟ್ ದಯವಿಟ್ಟು ಗುಂಪಿನ ಕಂಪೆನಿ &#39;ಆಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮುಂದಿನ ದಿನಾಂಕದಂದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},ರೋ # {0}: ಸೀರಿಯಲ್ ಯಾವುದೇ {1} ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Stock Entry,Target Warehouse Address,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ವಿಳಾಸ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,ರಜೆ
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ಶಿಫ್ಟ್ ಪ್ರಾರಂಭದ ಸಮಯದ ಮೊದಲು ನೌಕರರ ಚೆಕ್-ಇನ್ ಅನ್ನು ಹಾಜರಾತಿಗಾಗಿ ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ.
@@ -6583,7 +6614,6 @@
 DocType: Employee Grade,Employee Grade,ಉದ್ಯೋಗಿ ಗ್ರೇಡ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,ಜೂನ್
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 DocType: Share Balance,From No,ಇಲ್ಲ
 DocType: Shift Type,Early Exit Grace Period,ಆರಂಭಿಕ ನಿರ್ಗಮನ ಗ್ರೇಸ್ ಅವಧಿ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
@@ -6866,7 +6896,6 @@
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ಪಾತ್ರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ಅಥವಾ ಬಳಕೆದಾರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ಐಟಂಗೆ UOM ಪರಿವರ್ತನೆ ಅಂಶ ({0} -&gt; {1}) ಕಂಡುಬಂದಿಲ್ಲ: {2}
 DocType: Journal Entry,Write Off Entry,ಎಂಟ್ರಿ ಆಫ್ ಬರೆಯಿರಿ
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಫೀಲ್ಡ್ ಅಕಾಡೆಮಿಕ್ ಟರ್ಮ್ ಪ್ರೋಗ್ರಾಂ ದಾಖಲಾತಿ ಪರಿಕರದಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ."
@@ -7003,6 +7032,7 @@
 DocType: Budget,Warn,ಎಚ್ಚರಿಕೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,ಈ ಕೆಲಸದ ಆದೇಶಕ್ಕಾಗಿ ಈಗಾಗಲೇ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
+DocType: Bank Account,Company Account,ಕಂಪನಿ ಖಾತೆ
 DocType: Asset Maintenance,Manufacturing User,ಉತ್ಪಾದನಾ ಬಳಕೆದಾರ
 DocType: Purchase Invoice,Raw Materials Supplied,ವಿತರಿಸುತ್ತಾರೆ ರಾ ಮೆಟೀರಿಯಲ್ಸ್
 DocType: Subscription Plan,Payment Plan,ಪಾವತಿ ಯೋಜನೆ
@@ -7044,6 +7074,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ಕೆಲಸದ ಆದೇಶದಲ್ಲಿ {2} ಯೋಜಿತ ಪ್ರಮಾಣಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬಾರದು {3}
 DocType: Certification Application,Name of Applicant,ಅರ್ಜಿದಾರರ ಹೆಸರು
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,ಉತ್ಪಾದನೆ ಟೈಮ್ ಶೀಟ್.
+DocType: Quick Stock Balance,Quick Stock Balance,ತ್ವರಿತ ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,ಉಪಮೊತ್ತ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,ಸ್ಟಾಕ್ ವ್ಯವಹಾರದ ನಂತರ ರೂಪಾಂತರ ಗುಣಲಕ್ಷಣಗಳನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ. ಇದನ್ನು ಮಾಡಲು ನೀವು ಹೊಸ ಐಟಂ ಅನ್ನು ಮಾಡಬೇಕಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,ಗೋಕಾರ್ಡರ್ಲೆಸ್ SEPA ಮ್ಯಾಂಡೇಟ್
@@ -7367,6 +7398,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ನಿಷ್ಕ್ರಿಯ ವಿದ್ಯಾರ್ಥಿ
 DocType: Employee,Health Details,ಆರೋಗ್ಯ ವಿವರಗಳು
+DocType: Coupon Code,Coupon Type,ಕೂಪನ್ ಪ್ರಕಾರ
 DocType: Leave Encashment,Encashable days,ಎನ್ಕ್ಯಾಷಬಲ್ ದಿನಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,ಒಂದು ಪಾವತಿ ವಿನಂತಿ ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಅಗತ್ಯವಿದೆ ರಚಿಸಲು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,ಒಂದು ಪಾವತಿ ವಿನಂತಿ ಉಲ್ಲೇಖ ಡಾಕ್ಯುಮೆಂಟ್ ಅಗತ್ಯವಿದೆ ರಚಿಸಲು
@@ -7651,6 +7683,7 @@
 DocType: Hotel Room Package,Amenities,ಸೌಕರ್ಯಗಳು
 DocType: Accounts Settings,Automatically Fetch Payment Terms,ಪಾವತಿ ನಿಯಮಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಡೆದುಕೊಳ್ಳಿ
 DocType: QuickBooks Migrator,Undeposited Funds Account,ಗುರುತಿಸಲಾಗದ ಫಂಡ್ಸ್ ಖಾತೆ
+DocType: Coupon Code,Uses,ಉಪಯೋಗಗಳು
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,ಬಹುಪಾಲು ಡೀಫಾಲ್ಟ್ ಮೋಡ್ ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Sales Invoice,Loyalty Points Redemption,ಲಾಯಲ್ಟಿ ಪಾಯಿಂಟುಗಳು ರಿಡೆಂಪ್ಶನ್
 ,Appointment Analytics,ನೇಮಕಾತಿ ಅನಾಲಿಟಿಕ್ಸ್
@@ -7668,6 +7701,7 @@
 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","ಪರಿಶೀಲಿಸಿದರೆ, ಕೆಲಸ ದಿನಗಳ ಒಟ್ಟು ಯಾವುದೇ ರಜಾದಿನಗಳು ಸೇರಿವೆ , ಮತ್ತು ಈ ಸಂಬಳ ದಿನಕ್ಕೆ ಮೌಲ್ಯವನ್ನು ಕಡಿಮೆಗೊಳಿಸುತ್ತದೆ"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,ಡೊಮೇನ್ ಸೇರಿಸಲು ವಿಫಲವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","ಓವರ್ ರಶೀದಿ / ವಿತರಣೆಯನ್ನು ಅನುಮತಿಸಲು, ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಅಥವಾ ಐಟಂನಲ್ಲಿ &quot;ಓವರ್ ರಶೀದಿ / ವಿತರಣಾ ಭತ್ಯೆ&quot; ಅನ್ನು ನವೀಕರಿಸಿ."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","ಪ್ರಸ್ತುತ ಕೀಲಿಯನ್ನು ಬಳಸುವ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ, ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ?"
 DocType: Subscription Settings,Prorate,ಪ್ರಾರ್ಥಿಸು
@@ -7681,6 +7715,7 @@
 ,BOM Stock Report,ಬಿಒಎಮ್ ಸ್ಟಾಕ್ ವರದಿ
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","ನಿಗದಿಪಡಿಸಿದ ಟೈಮ್‌ಸ್ಲಾಟ್ ಇಲ್ಲದಿದ್ದರೆ, ಈ ಗುಂಪಿನಿಂದ ಸಂವಹನವನ್ನು ನಿರ್ವಹಿಸಲಾಗುತ್ತದೆ"
 DocType: Stock Reconciliation Item,Quantity Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 ,Electronic Invoice Register,ಎಲೆಕ್ಟ್ರಾನಿಕ್ ಸರಕುಪಟ್ಟಿ ನೋಂದಣಿ
@@ -7934,6 +7969,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Item Group,General Settings,ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Article,Article,ಲೇಖನ
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,ದಯವಿಟ್ಟು ಕೂಪನ್ ಕೋಡ್ ನಮೂದಿಸಿ !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ಚಲಾವಣೆಯ ಮತ್ತು ಕರೆನ್ಸಿ ಇರಲಾಗುವುದಿಲ್ಲ
 DocType: Taxable Salary Slab,Percent Deduction,ಪರ್ಸೆಂಟ್ ಡಿಡಕ್ಷನ್
 DocType: GL Entry,To Rename,ಮರುಹೆಸರಿಸಲು
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 1ff9873..91d8198 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT- .YYYY.-
 DocType: Purchase Order,Customer Contact,고객 연락처
 DocType: Shift Type,Enable Auto Attendance,자동 출석 사용
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,창고 및 날짜를 입력하십시오
 DocType: Lost Reason Detail,Opportunity Lost Reason,기회 손실 원인
 DocType: Patient Appointment,Check availability,이용 가능 여부 확인
 DocType: Retention Bonus,Bonus Payment Date,보너스 지급일
@@ -265,6 +266,7 @@
 ,Completed Work Orders,완료된 작업 주문
 DocType: Support Settings,Forum Posts,포럼 게시물
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage",작업이 백그라운드 작업으로 대기열에 포함되었습니다. 백그라운드에서 처리하는 데 문제가있는 경우 시스템에서이 주식 조정의 오류에 대한 설명을 추가하고 초안 단계로 되돌립니다.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started",쿠폰 코드 유효성이 시작되지 않았습니다.
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,과세 대상 금액
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: Leave Policy,Leave Policy Details,정책 세부 정보 남김
@@ -330,6 +332,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,소모품
 DocType: Student,B-,비-
 DocType: Assessment Result,Grade,학년
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Restaurant Table,No of Seats,좌석 수
 DocType: Sales Invoice,Overdue and Discounted,연체 및 할인
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,통화 끊김
@@ -507,6 +510,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,즉 양에 대한 줄 간격
 DocType: Vehicle,Additional Details,추가 세부 사항
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,주어진 설명이 없습니다
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,창고에서 물품 반입
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,구입 요청합니다.
 DocType: POS Closing Voucher Details,Collected Amount,징수 금액
 DocType: Lab Test,Submitted Date,제출 날짜
@@ -614,6 +618,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,배우다
 ,Trial Balance (Simple),시산표 (단순)
 DocType: Purchase Invoice Item,Enable Deferred Expense,지연 지출 활성화
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,적용 쿠폰 코드
 DocType: Asset,Next Depreciation Date,다음 감가 상각 날짜
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,직원 당 활동 비용
 DocType: Accounts Settings,Settings for Accounts,계정에 대한 설정
@@ -854,8 +859,6 @@
 DocType: Sales Invoice,Total Qty,총 수량
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 이메일 ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 이메일 ID
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","이 문서를 취소하려면 직원 <a href=""#Form/Employee/{0}"">{0}을 (를)</a> 삭제하십시오"
 DocType: Item,Show in Website (Variant),웹 사이트에 표시 (변형)
 DocType: Employee,Health Concerns,건강 문제
 DocType: Payroll Entry,Select Payroll Period,급여 기간을 선택
@@ -1021,6 +1024,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,세금 원천 징수 계정
 DocType: Pricing Rule,Sales Partner,영업 파트너
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,모든 공급자 스코어 카드.
+DocType: Coupon Code,To be used to get discount,할인을받는 데 사용
 DocType: Buying Settings,Purchase Receipt Required,필수 구입 영수증
 DocType: Sales Invoice,Rail,레일
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,실제 비용
@@ -1071,6 +1075,7 @@
 DocType: Production Plan,Production Plan,생산 계획
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,개설 송장 생성 도구
 DocType: Salary Component,Round to the Nearest Integer,가장 가까운 정수로 반올림
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,재고가없는 품목을 장바구니에 추가 할 수 있도록 허용
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,판매로 돌아 가기
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,일련 번호가없는 입력을 기준으로 트랜잭션의 수량 설정
 ,Total Stock Summary,총 주식 요약
@@ -1202,6 +1207,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),자료 시간 비율 (회사 통화)
 ,Qty To Be Billed,청구될 수량
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,납품 금액
+DocType: Coupon Code,Gift Card,기프트 카드
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,생산을위한 예비 수량 : 제조 품목을 만들기위한 원자재 수량.
 DocType: Loyalty Point Entry Redemption,Redemption Date,사용 날짜
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,이 은행 거래가 이미 완전히 조정되었습니다.
@@ -1290,6 +1296,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,작업 표 만들기
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,구매 송장
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,회원 자격이 30 일 이내에 만료되는 경우에만 갱신 할 수 있습니다.
 DocType: Shopping Cart Settings,Show Stock Availability,재고 상태 표시
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},자산 카테고리 {1} 또는 회사 {2}에서 {0}을 (를)
@@ -1587,7 +1594,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","예약 수량 : 수량 판매를 위해 주문,하지만 배달되지 않습니다."
 DocType: Drug Prescription,Interval UOM,간격 UOM
 DocType: Customer,"Reselect, if the chosen address is edited after save",저장 후 선택한 주소를 다시 선택한 경우 다시 선택하십시오.
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,외주 용 예약 수량 : 추심 품목을 만들기위한 원자재 수량.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,외주 용 예약 수량 : 추심 품목을 만들기위한 원자재 수량.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 DocType: Item,Hub Publishing Details,허브 출판 세부 정보
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;열기&#39;
@@ -1852,6 +1859,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,항목 및 UOM 가져 오기
 DocType: Repayment Schedule,Balance Loan Amount,잔액 대출 금액
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,세부 정보에 추가됨
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted",쿠폰 코드가 소진되었습니다.
 DocType: Communication Medium,Catch All,모두 잡아라.
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,일정 코스
 DocType: Budget,Applicable on Material Request,자재 요청에 적용 가능
@@ -2022,6 +2030,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,잘못된 속성
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} 제출해야합니다
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,이메일 캠페인
+DocType: Sales Partner,To Track inbound purchase,인바운드 구매를 추적하려면
 DocType: Buying Settings,Default Supplier Group,기본 공급 업체 그룹
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum amount eligible for the component {0} exceeds {1},{0} 구성 요소에 적합한 최대 금액이 {1}을 초과합니다.
@@ -2179,8 +2188,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,재고 항목 만들기
 DocType: Hotel Room Reservation,Hotel Reservation User,호텔 예약 사용자
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,상태 설정
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,첫 번째 접두사를 선택하세요
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Contract,Fulfilment Deadline,이행 마감
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,가까운
 DocType: Student,O-,영형-
@@ -2304,6 +2313,7 @@
 DocType: Quality Meeting Table,Under Review,검토 중
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,로그인 실패
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,저작물 {0}이 생성되었습니다.
+DocType: Coupon Code,Promotional,프로모션
 DocType: Special Test Items,Special Test Items,특별 시험 항목
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,마켓 플레이스에 등록하려면 System Manager 및 Item Manager 역할이있는 사용자 여야합니다.
 apps/erpnext/erpnext/config/buying.py,Key Reports,주요 보고서
@@ -2342,6 +2352,8 @@
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Type,문서 유형
 apps/erpnext/erpnext/controllers/selling_controller.py,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
 DocType: Subscription Plan,Billing Interval Count,청구 간격
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","이 문서를 취소하려면 직원 <a href=""#Form/Employee/{0}"">{0}을 (를)</a> 삭제하십시오"
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,Appointments and Patient Encounters,임명 및 환자 조우
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Value missing,가치 누락
 DocType: Employee,Department and Grade,학과 및 학년
@@ -2445,6 +2457,7 @@
 DocType: Project,Start and End Dates,시작 날짜를 종료
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,계약 템플릿 이행 조건
 ,Delivered Items To Be Billed,청구에 전달 항목
+DocType: Coupon Code,Maximum Use,최대 사용
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},열기 BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,웨어 하우스는 일련 번호 변경할 수 없습니다
 DocType: Authorization Rule,Average Discount,평균 할인
@@ -2607,6 +2620,7 @@
 DocType: Item,Inventory,재고
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Json으로 다운로드
 DocType: Item,Sales Details,판매 세부 사항
+DocType: Coupon Code,Used,익숙한
 DocType: Opportunity,With Items,항목
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',{1}의 {2} 캠페인에 대한 캠페인 &#39;{0}&#39;이 (가) 이미 있습니다.
 DocType: Asset Maintenance,Maintenance Team,유지 보수 팀
@@ -2736,7 +2750,7 @@
 						Serial No cannot be ensured",{0} 항목에 활성 BOM이 없습니다. \ Serial No 로의 배송은 보장 할 수 없습니다.
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 DocType: Loan Type,Maximum Loan Amount,최대 대출 금액
-DocType: Pricing Rule,Pricing Rule,가격 규칙
+DocType: Coupon Code,Pricing Rule,가격 규칙
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
@@ -2816,6 +2830,7 @@
 DocType: Payment Schedule,Payment Amount,결제 금액
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,반나절 날짜는 작업 시작 날짜와 종료 날짜 사이에 있어야합니다.
 DocType: Healthcare Settings,Healthcare Service Items,의료 서비스 품목
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,잘못된 바코드입니다. 이 바코드에 부착 된 품목이 없습니다.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,소비 금액
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,현금의 순 변화
 DocType: Assessment Plan,Grading Scale,등급 규모
@@ -2937,7 +2952,6 @@
 DocType: Share Transfer,Asset Account,자산 계좌
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,새로운 출시 날짜가 미래에 있어야합니다.
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인사 관리&gt; HR 설정에서 직원 이름 지정 시스템을 설정하십시오
 DocType: Lab Test,Technician Name,기술자 이름
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3049,6 +3063,7 @@
 DocType: Products Settings,Hide Variants,변형 숨기기
 DocType: Lead,Next Contact By,다음 접촉
 DocType: Compensatory Leave Request,Compensatory Leave Request,보상 휴가 요청
+apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings",{1} 행의 {0} 항목에 {2}보다 많은 비용을 청구 할 수 없습니다. 초과 청구를 허용하려면 계정 설정에서 허용 한도를 설정하십시오.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Quantity required for Item {0} in row {1},상품에 필요한 수량 {0} 행에서 {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouse {0} can not be deleted as quantity exists for Item {1},수량이 항목에 대한 존재하는 창고 {0} 삭제할 수 없습니다 {1}
 DocType: Blanket Order,Order Type,주문 유형
@@ -3221,7 +3236,6 @@
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
 DocType: Employee Benefit Claim,Claim Benefit For,에 대한 보상 혜택
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings",{1} 행의 {0} 항목이 {2} 이상으로 과다 보급 될 수 없습니다. 초과 청구를 허용하려면 재고 설정에서 설정하십시오.
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,응답 업데이트
 apps/erpnext/erpnext/public/js/utils.js,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
@@ -3515,6 +3529,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,회사에 통화를 지정하십시오
 DocType: Workstation,Wages per hour,시간당 임금
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},{0} 구성
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,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,Following Material Requests have been raised automatically based on Item's re-order level,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
@@ -3847,6 +3862,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,급여 슬립 제출
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,보류 중
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,퀘스트는 적어도 하나의 올바른 옵션을 가져야합니다.
+apps/erpnext/erpnext/hooks.py,Purchase Orders,구매 주문
 DocType: Account,Inter Company Account,회사 간 계정
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,대량 수입
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
@@ -3857,6 +3873,7 @@
 DocType: POS Profile,[Select],[선택]
 DocType: Staffing Plan Detail,Number Of Positions,직위 수
 DocType: Vital Signs,Blood Pressure (diastolic),혈압 (확장기)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,고객을 선택하십시오.
 DocType: SMS Log,Sent To,전송
 DocType: Agriculture Task,Holiday Management,휴일 관리
 DocType: Payment Request,Make Sales Invoice,견적서에게 확인
@@ -4067,7 +4084,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} 제출되지 않았습니다.
 DocType: Subscription,Trialling,Trialling
 DocType: Sales Invoice Item,Deferred Revenue,지연된 수익
-DocType: Bank Account,GL Account,GL 계정
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,현금 계정은 판매 송장 생성에 사용됩니다.
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,면제 하위 카테고리
 DocType: Member,Membership Expiry Date,회원 자격 만료일
@@ -4493,13 +4509,13 @@
 DocType: C-Form Invoice Detail,Territory,국가
 DocType: Pricing Rule,Apply Rule On Item Code,항목 코드에 규칙 적용
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,재고 잔고 보고서
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,보수
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,누적 금액 표시
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,진행중인 업데이트. 시간이 좀 걸릴 수 있습니다.
 DocType: Production Plan Item,Produced Qty,생산 수량
 DocType: Vehicle Log,Fuel Qty,연료 수량
-DocType: Stock Entry,Target Warehouse Name,대상 창고 이름
 DocType: Work Order Operation,Planned Start Time,계획 시작 시간
 DocType: Course,Assessment,평가
 DocType: Payment Entry Reference,Allocated,할당
@@ -4577,10 +4593,12 @@
  1.등 주소 분쟁, 손해 배상, 책임, 
  하나의 방법.주소 및 회사의 연락."
 DocType: Homepage Section,Section Based On,섹션 기반
+DocType: Shopping Cart Settings,Show Apply Coupon Code,쿠폰 코드 적용 표시
 DocType: Issue,Issue Type,이슈 유형
 DocType: Attendance,Leave Type,휴가 유형
 DocType: Purchase Invoice,Supplier Invoice Details,공급 업체 인보이스 세부 사항
 DocType: Agriculture Task,Ignore holidays,휴일을 무시하십시오.
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,쿠폰 조건 추가 / 편집
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,비용 / 차이 계정 ({0})의 이익 또는 손실 '계정이어야합니다
 DocType: Stock Entry Detail,Stock Entry Child,입국 어린이
 DocType: Project,Copied From,에서 복사 됨
@@ -4756,6 +4774,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,평가 계획 기준
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,업무
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,구매 주문 방지
+DocType: Coupon Code,Coupon Name,쿠폰 이름
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,느끼기 쉬운
 DocType: Email Campaign,Scheduled,예약된
 DocType: Shift Type,Working Hours Calculation Based On,근무 시간 계산에 근거
@@ -4772,7 +4791,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,변형 만들기
 DocType: Vehicle,Diesel,디젤
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,가격리스트 통화 선택하지
+DocType: Quick Stock Balance,Available Quantity,주문 가능 수량
 DocType: Purchase Invoice,Availed ITC Cess,제공되는 ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 ,Student Monthly Attendance Sheet,학생 월별 출석 시트
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,판매에만 적용되는 배송 규칙
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 구입일 이전 일 수 없습니다.
@@ -4840,8 +4861,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 DocType: Quality Meeting,Quality Meeting,품질 회의
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,그룹에 비 그룹
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Employee,ERPNext User,ERPNext 사용자
+DocType: Coupon Code,Coupon Description,쿠폰 설명
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},배치는 {0} 행에서 필수 항목입니다.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},배치는 {0} 행에서 필수 항목입니다.
 DocType: Company,Default Buying Terms,기본 구매 조건
@@ -5006,6 +5027,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,문서의 세부 사항에 대한 없음
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},{0} 국가에서는 삭제할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,파티의 종류는 필수입니다
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,쿠폰 코드 적용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry",구직 카드 {0}의 경우 &#39;제조를위한 자재 이전&#39;유형 재고 입력 만 할 수 있습니다
 DocType: Quality Inspection,Outgoing,발신
 DocType: Customer Feedback Table,Customer Feedback Table,고객 피드백 표
@@ -5158,7 +5180,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,구매 주문서 제출
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,모든 공급 업체 추가
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,행 번호 {0} : 할당 된 금액은 미납 금액을 초과 할 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Tally Migration,Parties,당사국들
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,보안 대출
@@ -5190,7 +5211,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},항목 {0}에 대해 대체 항목을 설정할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,공인 서명자
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),순 ITC 가능 (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,수수료 생성
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
@@ -5215,6 +5235,7 @@
 DocType: Quiz Result,Wrong,잘못된
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,가격 목록의 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
+DocType: Sales Partner,Referral Code,추천 코드
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,총 선불 금액은 총 승인 금액보다 클 수 없습니다.
 DocType: Salary Slip,Hour Rate,시간 비율
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,자동 재주문 사용
@@ -5345,6 +5366,7 @@
 DocType: Shopping Cart Settings,Show Stock Quantity,재고 수량 표시
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Cash from Operations,조작에서 순 현금
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row #{0}: Status must be {1} for Invoice Discounting {2},행 번호 {0} : 인보이스 할인 {2}의 상태는 {1}이어야합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 4,항목 4
 DocType: Student Admission,Admission End Date,입학 종료 날짜
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py,Sub-contracting,하위 계약
@@ -5367,6 +5389,7 @@
 DocType: Travel Request,Fully Sponsored,후원사
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,역 분개 항목
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,작업 카드 생성
+DocType: Quotation,Referral Sales Partner,추천 영업 파트너
 DocType: Quality Procedure Process,Process Description,프로세스 설명
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,고객 {0}이 (가) 생성되었습니다.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,현재 어떤 창고에서도 재고가 없습니다.
@@ -5501,6 +5524,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM 평가
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,업로드 된 파일 읽기
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel",작업 지시 중단을 취소 할 수 없습니다. 취소하려면 먼저 취소하십시오.
+DocType: Coupon Code,Coupon Code,쿠폰 코드
 DocType: Asset,Journal Entry for Scrap,스크랩에 대한 분개
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,배달 주에서 항목을 뽑아주세요
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},행 {0} : 작업 {1}에 대한 워크 스테이션을 선택하십시오.
@@ -5585,6 +5609,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;날짜&#39;필요
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,데이터 가져 오기 및 내보내기
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired",쿠폰 코드 유효 기간이 만료되었습니다.
 DocType: Bank Account,Account Details,합계좌 세부사항
 DocType: Crop,Materials Required,필요한 자료
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,어떤 학생들은 찾을 수 없음
@@ -5622,6 +5647,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,사용자 이동
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,지불 금액 + 금액 오프 쓰기 총합보다 클 수 없습니다
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} 항목에 대한 유효한 배치 번호없는 {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,유효한 쿠폰 코드를 입력하십시오!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},참고 : 허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Task,Task Description,과업 설명
 DocType: Training Event,Seminar,세미나
@@ -5889,6 +5915,7 @@
 ,TDS Payable Monthly,매월 TDS 지급
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,BOM 대체 대기. 몇 분이 걸릴 수 있습니다.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인사 관리&gt; HR 설정에서 직원 이름 지정 시스템을 설정하십시오
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,총 지불액
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,송장과 일치 결제
@@ -5979,6 +6006,7 @@
 DocType: Production Plan,Get Raw Materials For Production,생산 원료 확보
 DocType: Job Opening,Job Title,직책
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,향후 결제 참조
+DocType: Quotation,Additional Discount and Coupon Code,추가 할인 및 쿠폰 코드
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.",{0}은 {1}이 따옴표를 제공하지 않지만 모든 항목은 인용 된 것을 나타냅니다. RFQ 견적 상태 갱신.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}.,최대 샘플 - {0}은 배치 {1}의 배치 {1} 및 항목 {2}에 대해 이미 보유되었습니다.
@@ -6208,7 +6236,9 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,웹 사이트 홈페이지에 대한 설정
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0}은 (는) {1}까지 보류 중입니다.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},{1}의 스코어 카드로 인해 RFQ가 {0}에 허용되지 않습니다.
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,구매 송장 생성
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,중고 잎
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,{0} Coupon used are {1}. Allowed quantity is exhausted,{0} 사용 된 쿠폰은 {1}입니다. 허용 수량이 소진되었습니다
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,자료 요청을 제출 하시겠습니까
 DocType: Job Offer,Awaiting Response,응답을 기다리는 중
 DocType: Course Schedule,EDU-CSH-.YYYY.-,EDU-CSH-.YYYY.-
@@ -6222,6 +6252,7 @@
 DocType: Training Event Employee,Optional,선택 과목
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 DocType: Agriculture Analysis Criteria,Water Analysis,수질 분석
+DocType: Sales Order,Skip Delivery Note,납품서 건너 뛰기
 DocType: Price List,Price Not UOM Dependent,UOM에 의존하지 않는 가격
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,변형 {0}이 생성되었습니다.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,기본 서비스 수준 계약이 이미 있습니다.
@@ -6330,6 +6361,7 @@
 DocType: Vehicle,Last Carbon Check,마지막으로 탄소 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Legal Expenses,법률 비용
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select quantity on row ,행의 수량을 선택하십시오.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Work Order {0}: job card not found for the operation {1},작업 지시 {0} : 작업 {1}에 대한 작업 카드를 찾을 수 없습니다
 DocType: Purchase Invoice,Posting Time,등록시간
 DocType: Timesheet,% Amount Billed,청구 % 금액
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Telephone Expenses,전화 비용
@@ -6432,7 +6464,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,추가 세금 및 수수료
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 사용 가능일 이전 일 수 없습니다.
 ,Sales Funnel,판매 퍼넬
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,카트
@@ -6528,6 +6559,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.",로열티 포인트는 언급 된 징수 요인에 근거하여 완료된 지출액 (판매 송장을 통해)에서 계산됩니다.
 DocType: Program Enrollment Tool,Enroll Students,학생 등록
+DocType: Pricing Rule,Coupon Code Based,쿠폰 코드 기반
 DocType: Company,HRA Settings,HRA 설정
 DocType: Homepage,Hero Section,영웅 섹션
 DocType: Employee Transfer,Transfer Date,이전 날짜
@@ -6644,6 +6676,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',그룹화 기준이 &#39;회사&#39;인 경우 회사 필터를 비워 두십시오.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,게시 날짜는 미래의 날짜 수 없습니다
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},행 번호 {0} : 일련 번호 {1}과 일치하지 않는 {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 DocType: Stock Entry,Target Warehouse Address,대상 창고 주소
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,캐주얼 허가
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,직원 수표가 출석으로 간주되는 근무 시작 시간 전의 시간.
@@ -6678,7 +6711,6 @@
 DocType: Employee Grade,Employee Grade,직원 급료
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,일한 분량에 따라 공임을 지급받는 일
 DocType: GSTR 3B Report,June,유월
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Share Balance,From No,~부터
 DocType: Shift Type,Early Exit Grace Period,조기 퇴거 유예 기간
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
@@ -6965,7 +6997,6 @@
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,역할을 승인 또는 사용을 승인 입력하십시오
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,엔티티 유형 {0} 및 엔티티 {1}을 (를) 사용하는 서비스 수준 계약이 이미 존재합니다.
 DocType: Journal Entry,Write Off Entry,항목 오프 쓰기
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
@@ -7104,6 +7135,7 @@
 DocType: Budget,Warn,경고
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,이 작업 주문을 위해 모든 항목이 이미 전송되었습니다.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
+DocType: Bank Account,Company Account,회사 계정
 DocType: Asset Maintenance,Manufacturing User,제조 사용자
 DocType: Purchase Invoice,Raw Materials Supplied,공급 원료
 DocType: Subscription Plan,Payment Plan,지불 계획
@@ -7145,6 +7177,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},작업 공정 {3}에서 {0} ({1})은 계획 수량 ({2})보다 클 수 없습니다.
 DocType: Certification Application,Name of Applicant,신청자 성명
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,제조 시간 시트.
+DocType: Quick Stock Balance,Quick Stock Balance,빠른 재고 잔고
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,소계
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,주식 거래 후 Variant 속성을 변경할 수 없습니다. 이 작업을 수행하려면 새 항목을 만들어야합니다.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,GoCardless SEPA 위임장
@@ -7473,6 +7506,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
 DocType: Employee,Health Details,건강의 자세한 사항
+DocType: Coupon Code,Coupon Type,쿠폰 종류
 DocType: Leave Encashment,Encashable days,어려운 날
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,지불 요청 참조 문서를 작성하려면 필수 항목입니다.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,지불 요청 참조 문서를 작성하려면 필수 항목입니다.
@@ -7762,6 +7796,7 @@
 DocType: Hotel Room Package,Amenities,예의
 DocType: Accounts Settings,Automatically Fetch Payment Terms,지불 조건 자동 가져 오기
 DocType: QuickBooks Migrator,Undeposited Funds Account,Undeposited Funds Account
+DocType: Coupon Code,Uses,용도
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,여러 기본 결제 방법이 허용되지 않습니다.
 DocType: Sales Invoice,Loyalty Points Redemption,충성도 포인트 사용
 ,Appointment Analytics,약속 분석
@@ -7779,6 +7814,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,1 년에 학생 그룹을 만들면 비워 둡니다.
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,1 년에 학생 그룹을 만들면 비워 둡니다.
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","이 옵션을 선택하면 총 없음. 작업 일의 휴일을 포함하며,이 급여 당 일의 가치를 감소시킬 것이다"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,도메인을 추가하지 못했습니다
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.",수령 / 배송을 허용하려면 재고 설정 또는 품목에서 &quot;초과 수령 / 인도 수당&quot;을 업데이트하십시오.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?",현재 키를 사용하는 앱은 액세스 할 수 없습니다. 확실합니까?
 DocType: Subscription Settings,Prorate,비례 배당
@@ -7792,6 +7828,7 @@
 ,BOM Stock Report,BOM 재고 보고서
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","할당 된 타임 슬롯이 없다면, 통신은이 그룹에 의해 처리 될 것이다"
 DocType: Stock Reconciliation Item,Quantity Difference,수량 차이
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 ,Electronic Invoice Register,전자 인보이스 등록
@@ -8046,6 +8083,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),차감 세금 및 수수료 (회사 통화)
 DocType: Item Group,General Settings,일반 설정
 DocType: Article,Article,조
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,쿠폰 코드를 입력하십시오 !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,통화와 통화하는 방법은 동일 할 수 없습니다
 DocType: Taxable Salary Slab,Percent Deduction,비율 공제
 DocType: GL Entry,To Rename,이름 바꾸기
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 7d3f27b..8e2d989 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -46,6 +46,7 @@
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-YYYY-
 DocType: Purchase Order,Customer Contact,mişterî Contact
 DocType: Shift Type,Enable Auto Attendance,Beşdariya Otomatîkî çalak bike
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Please enter Warehouse and Date,Ji kerema xwe Warehouse û Dîrokê binivîsin
 DocType: Lost Reason Detail,Opportunity Lost Reason,Sedema winda ya Derfet
 DocType: Patient Appointment,Check availability,Peyda bikin
 DocType: Retention Bonus,Bonus Payment Date,Daxistina Bonus Bonus
@@ -258,6 +259,7 @@
 ,Completed Work Orders,Birêvebirina Kar
 DocType: Support Settings,Forum Posts,Forum Mesaj
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,"The task has been enqueued as a background job. In case there is any issue on processing in background, the system will add a comment about the error on this Stock Reconciliation and revert to the Draft stage","Peywir wekî karekî paşverû tête peyda kirin. Digel vê yekê pirsgirêkek heye ku di paşpirtikê de pirsgirêk çêbibe, dê pergalê li ser xeletiyek li ser vê Lihevkirina Stock-ê şîroveyek zêde bike û vegere qonaxa Drav"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has not started","Bibore, derbasbûna kodê ya kodon dest pê nekiriye"
 apps/erpnext/erpnext/regional/india/utils.py,Taxable Amount,Şêwaz ber bacê
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,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: Leave Policy,Leave Policy Details,Dîtina Dîtina Bilind
@@ -322,6 +324,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,bikaranînê
 DocType: Student,B-,B-
 DocType: Assessment Result,Grade,Sinif
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 DocType: Restaurant Table,No of Seats,No Seats
 DocType: Sales Invoice,Overdue and Discounted,Zêde û bêhêz kirin
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Disconnected,Gazî veqetandin
@@ -498,6 +501,7 @@
 DocType: Cheque Print Template,Line spacing for amount in words,spacing Line ji bo mîktarê li gotinên
 DocType: Vehicle,Additional Details,Details Additional
 apps/erpnext/erpnext/templates/generators/bom.html,No description given,No description dayîn
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js,Fetch Items from Warehouse,Tiştên ji Warehouse bigirin
 apps/erpnext/erpnext/config/buying.py,Request for purchase.,ji bo kirînê bixwaze.
 DocType: POS Closing Voucher Details,Collected Amount,Amûdê Collect Collect
 DocType: Lab Test,Submitted Date,Dîroka Submitted
@@ -604,6 +608,7 @@
 apps/erpnext/erpnext/config/desktop.py,Learn,Fêrbûn
 ,Trial Balance (Simple),Balansek Trial (Simple)
 DocType: Purchase Invoice Item,Enable Deferred Expense,Expansed Deferred Enabled
+apps/erpnext/erpnext/templates/includes/order/order_taxes.html,Applied Coupon Code,Koda kodê ya sepandî
 DocType: Asset,Next Depreciation Date,Next Date Farhad.
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js,Activity Cost per Employee,Cost Activity per Employee
 DocType: Accounts Settings,Settings for Accounts,Mîhengên ji bo Accounts
@@ -1003,6 +1008,7 @@
 DocType: Tax Withholding Account,Tax Withholding Account,Hesabê Bacê
 DocType: Pricing Rule,Sales Partner,Partner Sales
 apps/erpnext/erpnext/config/buying.py,All Supplier scorecards.,All Supplier Scorecards.
+DocType: Coupon Code,To be used to get discount,Ji bo ku bikar anîn dakêşin
 DocType: Buying Settings,Purchase Receipt Required,Meqbûz kirînê pêwîst
 DocType: Sales Invoice,Rail,Hesinê tirêne
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Mesrefa rastîn
@@ -1050,6 +1056,7 @@
 DocType: Production Plan,Production Plan,Plana hilberînê
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Di Vebijandina Destûra Rêkeftinê de vekin
 DocType: Salary Component,Round to the Nearest Integer,Rêze Li Ser Niqaşê Nêzik
+DocType: Shopping Cart Settings,Allow items not in stock to be added to cart,Destûr bidin tiştên ku ne di stûyê xwe de ne ku bi zorê werin zêdekirin
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Sales Return,Return Sales
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,Li Qanûna Qanûna Saziyê Hilbijêre Li ser Serial No Serial
 ,Total Stock Summary,Stock Nasname Total
@@ -1178,6 +1185,7 @@
 DocType: BOM Operation,Base Hour Rate(Company Currency),Saet Rate Base (Company Exchange)
 ,Qty To Be Billed,Qty To Bills
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Şêwaz teslîmî
+DocType: Coupon Code,Gift Card,Diyariya Karta
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty Ji bo Hilberînê Qedandî: Kêmasiya madeyên xav ji bo çêkirina tiştên çêker.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Dîroka Veweşandinê
 apps/erpnext/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py,This bank transaction is already fully reconciled,Ev danûstendina bankê bi tevahî lihevhatî ye
@@ -1267,6 +1275,7 @@
 apps/erpnext/erpnext/utilities/activation.py,Create Timesheet,Timesheet biafirînin
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
+apps/erpnext/erpnext/hooks.py,Purchase Invoices,Pêşniyarên Kirînê bikirin
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Hûn dikarin tenê nûve bikin ku endametiya we di nav 30 rojan de derbas dibe
 DocType: Shopping Cart Settings,Show Stock Availability,Hilbijêre Stock Stock
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Set {0} in asset category {1} or company {2},Set in {0} li kategoriya {1} de an şîrket {2}
@@ -1542,7 +1551,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Qty Reserve: Quantity ferman da firotanê, lê nehatiye radest kirin."
 DocType: Drug Prescription,Interval UOM,UOM Interfer
 DocType: Customer,"Reselect, if the chosen address is edited after save","Hilbijêre, eger navnîşana bijartî piştî tomarkirinê hate guherandin"
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcotracted items.,Qiyama Reserve ji bo Nekokkêşanê: Kêmasiya madeyên xav ji bo çêkirina tiştên subcotracted.
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items.,Qiyama Reserve ji bo Nekokkêşanê: Kêmasiya madeyên xav ji bo çêkirina tiştên subcontracted.
 apps/erpnext/erpnext/stock/doctype/item/item.js,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
 DocType: Item,Hub Publishing Details,Agahdariyên Hub
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,'Opening',&#39;Dergeh&#39;
@@ -1805,6 +1814,7 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Items and UOMs,Itemsêkirina Tişt û UOM-ê
 DocType: Repayment Schedule,Balance Loan Amount,Balance Loan Mîqdar
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Added to details,Add to details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code are exhausted","Bibore, kodên kodonê pêça"
 DocType: Communication Medium,Catch All,Tev bigirtin
 apps/erpnext/erpnext/education/doctype/course_scheduling_tool/course_scheduling_tool.js,Schedule Course,Kurs de Cedwela
 DocType: Budget,Applicable on Material Request,Li ser daxwaznameya materyalê bicîh kirin
@@ -1974,6 +1984,7 @@
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Pêşbîr Invalid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} must be submitted,{0} {1} de divê bê şandin
 apps/erpnext/erpnext/selling/doctype/campaign/campaign_dashboard.py,Email Campaigns,Kampanyayên E-nameyê
+DocType: Sales Partner,To Track inbound purchase,Ji bo şopandina kirîna hundurîn
 DocType: Buying Settings,Default Supplier Group,Default Supplier Group
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
 DocType: Department Approver,Department Approver,Dezgeha nêzî
@@ -2127,8 +2138,8 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Navbera Stock Bikin
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Rewşa Set
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmarê saz bikin
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Navnîşan saz bikin
 DocType: Contract,Fulfilment Deadline,Pêdengiya Dawî
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Li nêzê te
 DocType: Student,O-,öó
@@ -2250,6 +2261,7 @@
 DocType: Quality Meeting Table,Under Review,Di bin Review
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to login,Têketin têkevin
 apps/erpnext/erpnext/controllers/buying_controller.py,Asset {0} created,Asset {0} hat afirandin
+DocType: Coupon Code,Promotional,Pêşkêşker
 DocType: Special Test Items,Special Test Items,Tîmên Taybet
 apps/erpnext/erpnext/public/js/hub/marketplace.js,You need to be a user with System Manager and Item Manager roles to register on Marketplace.,Pêdivî ye ku hûn bikar bîne ku bikarhênerên Rêveberê Gerînendeyê û Rêveberê Rêveberê Şîfre bikin ku li ser bazarê Marketplace bikin.
 apps/erpnext/erpnext/config/buying.py,Key Reports,Raporên sereke
@@ -2388,6 +2400,7 @@
 DocType: Project,Start and End Dates,Destpêk û dawiya Kurdî Nexşe
 DocType: Contract Template Fulfilment Terms,Contract Template Fulfilment Terms,Şertên Peymana Fulfillasyonê
 ,Delivered Items To Be Billed,Nawy teslîmî ye- Be
+DocType: Coupon Code,Maximum Use,Bikaranîna Maximum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html,Open BOM {0},Open BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Warehouse cannot be changed for Serial No.,Warehouse dikarin ji bo No. Serial ne bê guhertin
 DocType: Authorization Rule,Average Discount,Average Discount
@@ -2547,6 +2560,7 @@
 DocType: Item,Inventory,Inventory
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Wekî Json dakêşin
 DocType: Item,Sales Details,Details Sales
+DocType: Coupon Code,Used,Bikaranîn
 DocType: Opportunity,With Items,bi babetî
 apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',Kampanya &#39;{0}&#39; jixwe ji bo {1} &#39;{2}&#39; heye
 DocType: Asset Maintenance,Maintenance Team,Tîmên Parastinê
@@ -2672,7 +2686,7 @@
 						Serial No cannot be ensured",BOM-ê çalak nabe BİXWÎNE {0}. Beriya \ \ Serial Na Nabe ku misoger nekin
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximum Mîqdar Loan
-DocType: Pricing Rule,Pricing Rule,Rule Pricing
+DocType: Coupon Code,Pricing Rule,Rule Pricing
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
 apps/erpnext/erpnext/config/help.py,Material Request to Purchase Order,Daxwaza madî ji bo Buy Order
@@ -2750,6 +2764,7 @@
 DocType: Payment Schedule,Payment Amount,Amûrdayê
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,Half Day Date should be in between Work From Date and Work End Date,Dîroka Dîroka Dîroka Dîroka Dîroka Dîroka Navend û Dîroka Dawî be
 DocType: Healthcare Settings,Healthcare Service Items,Xizmetên tendurustî yên tenduristî
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py,Invalid Barcode. There is no Item attached to this barcode.,Barcode xelet e. Li ser vê barcode ve ti tişt girêdayî ne.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Consumed Amount,Şêwaz telef
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,Change Net di Cash
 DocType: Assessment Plan,Grading Scale,pîvanê de
@@ -2867,7 +2882,6 @@
 DocType: Share Transfer,Asset Account,Hesabê Assist
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Dîroka berdana nû divê di pêşerojê de be
 DocType: Purchase Invoice,End date of current invoice's period,roja dawî ji dema fatûra niha ya
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Nomisyonkirina Karmendan saz bikin&gt; Mîhengên HR
 DocType: Lab Test,Technician Name,Nûnerê Teknîkî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3146,7 +3160,6 @@
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
 DocType: Employee Benefit Claim,Claim Benefit For,Ji bo Mafê Mirovan
-apps/erpnext/erpnext/controllers/accounts_controller.py,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings","Ji hêla {2} di rêza {1} de ji hêla {2} ve tête navnîşan nabe. Ji bo destûrkirina barkirinê, kerema xwe li Stock Settings"
 apps/erpnext/erpnext/templates/emails/training_event.html,Update Response,Response Update
 apps/erpnext/erpnext/public/js/utils.js,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
@@ -3435,6 +3448,7 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py,Please specify currency in Company,Ji kerema xwe ve pereyan li Company diyar
 DocType: Workstation,Wages per hour,"Mûçe, di saetekê de"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure {0},Configure {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},balance Stock li Batch {0} dê bibe neyînî {1} ji bo babet {2} li Warehouse {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Piştî Requests Material hatine automatically li ser asta re-da babete rabûye
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
@@ -3766,6 +3780,7 @@
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,Submit Salary Slip,Submit Slip Salary
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js,On Hold,Li Hold
 apps/erpnext/erpnext/education/doctype/question/question.py,A qustion must have at least one correct options,Qusyonek divê bi kêmanî yek vebijarkên rast be
+apps/erpnext/erpnext/hooks.py,Purchase Orders,Ordanên Kirînê
 DocType: Account,Inter Company Account,Kompaniya Inter Inter
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js,Import in Bulk,Import li Gir
 DocType: Sales Partner,Address & Contacts,Navnîşana &amp; Têkilî
@@ -3776,6 +3791,7 @@
 DocType: POS Profile,[Select],[Neqandin]
 DocType: Staffing Plan Detail,Number Of Positions,Hejmarên Pirtûka
 DocType: Vital Signs,Blood Pressure (diastolic),Pressure Pressure (diastolic)
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.py,Please select the customer.,Ji kerema xwe xerîdar hilbijêrin.
 DocType: SMS Log,Sent To,şandin To
 DocType: Agriculture Task,Holiday Management,Management Management
 DocType: Payment Request,Make Sales Invoice,Make Sales bi fatûreyên
@@ -3982,7 +3998,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is not submitted,{0} {1} ji pêşkêşkirî ne
 DocType: Subscription,Trialling,Tîma
 DocType: Sales Invoice Item,Deferred Revenue,Revenue Deferred
-DocType: Bank Account,GL Account,Hesabê GL
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,Hesabê kredê dê ji bo afirandina afirandina Înfiroşa Sales Sales
 DocType: Employee Tax Exemption Declaration Category,Exemption Sub Category,Kategorî Sub Submission
 DocType: Member,Membership Expiry Date,Endamê Dîroka Dawîbûnê
@@ -4380,13 +4395,13 @@
 DocType: C-Form Invoice Detail,Territory,Herêm
 DocType: Pricing Rule,Apply Rule On Item Code,Li ser Koda Koda Rêzikê bicîh bikin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please mention no of visits required,Ji kerema xwe re tu ji serdanên pêwîst behsa
+apps/erpnext/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js,Stock Balance Report,Raporta Bilindiya Stock
 DocType: Stock Settings,Default Valuation Method,Default Method Valuation
 apps/erpnext/erpnext/education/doctype/program/program_dashboard.py,Fee,Xerc
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js,Show Cumulative Amount,Amûdê Amûdê bide
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Pêşkeftina pêşveçûnê. Ew dibe ku demekê bigirin.
 DocType: Production Plan Item,Produced Qty,Qutkirî Qty
 DocType: Vehicle Log,Fuel Qty,Qty mazotê
-DocType: Stock Entry,Target Warehouse Name,Navê Navnîşa Navnîşana Navnîşan
 DocType: Work Order Operation,Planned Start Time,Bi plan Time Start
 DocType: Course,Assessment,Bellîkirinî
 DocType: Payment Entry Reference,Allocated,veqetandin
@@ -4452,10 +4467,12 @@
 1. Ways of addressing disputes, indemnity, liability, etc.
 1. Address and Contact of your Company.","Termên Standard û mercan ku dikare ji bo Sales û kirîna added. Nimûne: 1. Validity ji pêşniyarê. 1. Mercên Payment (Di Advance, Li ser Credit, part pêşwext û hwd.). 1. çi extra (an sûdî ji aliyê Mişterî) e. 1. Safety warning / Bikaranîna. 1. Warranty, eger. 1. Policy Þexsî. 1. Mercên shipping, eger hebin. 1. Riyên çareserkirina nakokiyan, hêlekê, berpirsiyarî, hwd 1. Address û Contact ji Company xwe."
 DocType: Homepage Section,Section Based On,Beş li ser bingeha
+DocType: Shopping Cart Settings,Show Apply Coupon Code,Afirandin Koda Coupon
 DocType: Issue,Issue Type,Tîpa Nimûne
 DocType: Attendance,Leave Type,Type Leave
 DocType: Purchase Invoice,Supplier Invoice Details,Supplier Details bi fatûreyên
 DocType: Agriculture Task,Ignore holidays,Betlaneyê bibînin
+apps/erpnext/erpnext/accounts/doctype/coupon_code/coupon_code.js,Add/Edit Coupon Conditions,Addertên Kuponê zêde bikin / biguherînin
 apps/erpnext/erpnext/controllers/stock_controller.py,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"account Expense / Cudahiya ({0}), divê hesabekî &#39;Profit an Loss&#39; be"
 DocType: Stock Entry Detail,Stock Entry Child,Zarok ketina Stock
 DocType: Project,Copied From,Kopiyek ji From
@@ -4626,6 +4643,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Şertên Plan Nirxandina
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,Transactions
 DocType: Supplier Scorecard Scoring Standing,Prevent Purchase Orders,Pêşniyarên kirînê bikujin
+DocType: Coupon Code,Coupon Name,Navê kodikê
 apps/erpnext/erpnext/healthcare/setup.py,Susceptible,Neheq
 DocType: Email Campaign,Scheduled,scheduled
 DocType: Shift Type,Working Hours Calculation Based On,Demjimêrên Karkirina Hêlîna Bingehîn
@@ -4642,7 +4660,9 @@
 apps/erpnext/erpnext/stock/doctype/item/item.js,Create Variants,Variantan biafirînin
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py,Price List Currency not selected,List Price Exchange hilbijartî ne
+DocType: Quick Stock Balance,Available Quantity,Hêjmarek peyda dike
 DocType: Purchase Invoice,Availed ITC Cess,ITC Cess
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Navnekirina Sêwiran saz bikin
 ,Student Monthly Attendance Sheet,Xwendekarên mihasebeya Beşdariyê Ayda
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule only applicable for Selling,Qanûna Rêvebirin tenê tenê ji bo firotina kirînê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Dîroka Berî Berê kirîna Dîroka
@@ -4710,8 +4730,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
 DocType: Quality Meeting,Quality Meeting,Civîna Quality
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Pol to Group
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Navnîşan bikin
 DocType: Employee,ERPNext User,ERPNext Bikarhêner
+DocType: Coupon Code,Coupon Description,Danasîna Cupon
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch li row wêneke e {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch li row wêneke e {0}
 DocType: Company,Default Buying Terms,Mercên Kirînê yên Default
@@ -4873,6 +4893,7 @@
 DocType: Maintenance Visit Purpose,Against Document Detail No,Li dijî Detail dokumênt No
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Deletion ji bo welatekî destûr nabe {0}
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Party Type is mandatory,Type Partiya wêneke e
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Apply Coupon Code,Koda kodê bicîh bikin
 DocType: Quality Inspection,Outgoing,nikarbe
 DocType: Customer Feedback Table,Customer Feedback Table,Tabloya Bersivê Xerîdar
 apps/erpnext/erpnext/config/support.py,Service Level Agreement.,Peymana asta karûbarê karûbarê.
@@ -5022,7 +5043,6 @@
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Li ser radestkirina Fermana Kirînê
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,All Suppliers
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: butçe ne dikarin bibin mezintir mayî bidin.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 DocType: Tally Migration,Parties,Partî
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,"Loans temînatê,"
@@ -5043,6 +5063,7 @@
 DocType: Appraisal,Appraisal,Qinetbirrînî
 DocType: Loan,Loan Account,Account
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Qanûnên derbasdar û derbasdar ji bo akumulkirinê mecbûrî ne
+apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,"For item {0} at row {1}, count of serial numbers does not match with the picked quantity","Ji bo tiştên {0} di rêza {1} de, jimara hejmarên serial bi hêjeya bijartî re nayê hev"
 DocType: Purchase Invoice,GST Details,GST Dîtin
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,This is based on transactions against this Healthcare Practitioner.,Ev li ser tedbîrên li dijî Pratîsyona Tenduristiyê ya bingehîn e.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Email sent to supplier {0},"Email şandin, da ku dabînkerê {0}"
@@ -5053,7 +5074,6 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne destûrê ji bo tiştek alternatîf hilbijêre {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Date tê dubarekirin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,mafdar
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Nomisandina Sêwiran saz bikin
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC ITapkirî (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Pêvek çêbikin
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost Purchase (via Purchase bi fatûreyên)
@@ -5078,6 +5098,7 @@
 DocType: Quiz Result,Wrong,Qelp
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Rate li ku currency list Price ji bo pereyan base mişterî bîya
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Şêwaz Net (Company Exchange)
+DocType: Sales Partner,Referral Code,Koda referansê
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Total advance amount cannot be greater than total sanctioned amount,Hêjeya pêşniyarê heya hema ji hejmarê vekirî ya bêtir mezintirîn
 DocType: Salary Slip,Hour Rate,Saet Rate
 apps/erpnext/erpnext/stock/doctype/item/item.py,Enable Auto Re-Order,Re-Fermandariya Otomatê çalak bikin
@@ -5227,6 +5248,7 @@
 DocType: Travel Request,Fully Sponsored,Fully Sponsored
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Reverse Journal Entry,Navnîşana rojnamevanê veguhestin
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create Job Card,Karta Xebatê biafirînin
+DocType: Quotation,Referral Sales Partner,Partner Firotan Referral
 DocType: Quality Procedure Process,Process Description,Danasîna pêvajoyê
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Customer {0} is created.,Têkilî {0} hatiye afirandin.
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js, Currently no stock available in any warehouse,Niha tu firotek li her wareyê heye
@@ -5357,6 +5379,7 @@
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Reading Uploaded File,Pelê Uploaded-ê xwendin
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,"Stopped Work Order cannot be cancelled, Unstop it first to cancel","Karta Karûbarê Rawestandin Tête qedexekirin, yekemîn betal bike ku ji bo betal bike"
+DocType: Coupon Code,Coupon Code,Koda kodê
 DocType: Asset,Journal Entry for Scrap,Peyam di Journal ji bo Scrap
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Please pull items from Delivery Note,Ji kerema xwe tomar ji Delivery Têbînî vekişîne
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Row {0}: select the workstation against the operation {1},Row {0}: Li dijî xebatê {1}
@@ -5437,6 +5460,7 @@
 apps/erpnext/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py,'Date' is required,&#39;Dîrok&#39; pêdivî ye
 apps/erpnext/erpnext/accounts/party.py,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
 apps/erpnext/erpnext/config/settings.py,Data Import and Export,Data Import û Export
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"Sorry,coupon code validity has expired","Bibore, derbasbûna kodê ya kodonê qedandiye"
 DocType: Bank Account,Account Details,Agahdariyên Hesab
 DocType: Crop,Materials Required,Materyalên pêwîst
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,No students Found,No xwendekarên dîtin.Di
@@ -5474,6 +5498,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Users,Herin Bikarhênerên
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Paid amount + Write Off Amount can not be greater than Grand Total,pereyan + hewe Off Mîqdar ne dikarin bibin mezintir Grand Total
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,{0} is not a valid Batch Number for Item {1},{0} e a Number Batch derbasdar e ji bo vî babetî bi {1}
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter valid coupon code !!,Ji kerema xwe kodê kodê ya derbasdar derbas bikin !!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Note: There is not enough leave balance for Leave Type {0},Têbînî: e balance îzna bes ji bo Leave Type tune ne {0}
 DocType: Task,Task Description,Danasîna Task
 DocType: Training Event,Seminar,Semîner
@@ -5739,6 +5764,7 @@
 ,TDS Payable Monthly,TDS Tenê Monthly
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Queued for replacing the BOM. It may take a few minutes.,Ji bo guhertina BOM. Ew dikare çend deqeyan bistînin.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Valuation û Total&#39;
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Nomisyonkirina Karmendan saz bikin
 apps/erpnext/erpnext/regional/report/irs_1099/irs_1099.py,Total Payments,Tezmînat Total
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Serial Nos Required for Serialized Item {0},Serial Nos pêwîst ji bo vî babetî weşandin {0}
 apps/erpnext/erpnext/config/accounting.py,Match Payments with Invoices,Payments Match bi fatûreyên
@@ -5827,6 +5853,7 @@
 DocType: Production Plan,Get Raw Materials For Production,Ji bo hilberîna hilberan
 DocType: Job Opening,Job Title,Manşeta şolê
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Future Payment Ref,Dravê Pêşerojê Ref
+DocType: Quotation,Additional Discount and Coupon Code,Daxuyaniya Zêdetir û Koda Coupon
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py,"{0} indicates that {1} will not provide a quotation, but all items \
 					have been quoted. Updating the RFQ quote status.","{0} nîşan dide ku {1} dê nirxandin nekirî, lê hemî tiştan \ nirxandin. Guherandinên RFQê radigihîne."
 DocType: Manufacturing Settings,Update BOM Cost Automatically,Bom Costa xwe bixweber bike
@@ -6050,6 +6077,7 @@
 apps/erpnext/erpnext/config/website.py,Settings for website homepage,Mîhengên ji bo homepage malpera
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} is on hold till {1},{0} heta ku li {1}
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,RFQs are not allowed for {0} due to a scorecard standing of {1},RFQ ji bo {1} ji bila {0} ji bo karmendek ji
+apps/erpnext/erpnext/templates/pages/order.html,Make Purchase Invoice,Pêşnûmeya Kirînê Bikin
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application_dashboard.html,Used Leaves,Leaves Used
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Ma hûn dixwazin daxwaziya materyalê bişînin
 DocType: Job Offer,Awaiting Response,li benda Response
@@ -6064,6 +6092,7 @@
 DocType: Training Event Employee,Optional,Bixwe
 DocType: Salary Slip,Earning & Deduction,Maaş &amp; dabirîna
 DocType: Agriculture Analysis Criteria,Water Analysis,Analysis
+DocType: Sales Order,Skip Delivery Note,Derketinê Têbînî
 DocType: Price List,Price Not UOM Dependent,Buhayê Ne girêdayî UOM
 apps/erpnext/erpnext/stock/doctype/item/item.js,{0} variants created.,Guhertin {0}.
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,A Default Service Level Agreement already exists.,Berê Peymana Asta Xizmeta Berê heye.
@@ -6269,7 +6298,6 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Bac û tawana Ev babete ji layê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Berî Berî Berî Berî Bikaranîna Dîrok-pey-be
 ,Sales Funnel,govekeke Sales
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Ereboka destan
@@ -6364,6 +6392,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned.","Points of loyalty will be calculated ((via via Sales Invoice), ji hêla faktora kolektîfê re behsa kirê ye."
 DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
+DocType: Pricing Rule,Coupon Code Based,Li gorî Koda Kuponê
 DocType: Company,HRA Settings,HRA Settings
 DocType: Homepage,Hero Section,Beşa Hero
 DocType: Employee Transfer,Transfer Date,Transfer Date
@@ -6478,6 +6507,7 @@
 apps/erpnext/erpnext/stock/report/total_stock_summary/total_stock_summary.py,Please set Company filter blank if Group By is 'Company',Xêra xwe Company wêr&#39;a vala eger Pol By e &#39;Company&#39;
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Posting Date cannot be future date,Deaktîv bike Date nikare bibe dîroka pêşerojê de
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Serial No {1} does not match with {2} {3},Row # {0}: Serial No {1} nayê bi hev nagirin {2} {3}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmarê saz bikin
 DocType: Stock Entry,Target Warehouse Address,Navnîşana Navnîşana Warehouse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Casual Leave,Leave Casual
 DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Wexta dema destpêkê ya guhartinê de dema ku Navnîşa Karmendê ji bo beşdarbûnê tête hesibandin.
@@ -6512,7 +6542,6 @@
 DocType: Employee Grade,Employee Grade,Dibistana
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,Pûşper
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 DocType: Share Balance,From No,Ji Na
 DocType: Shift Type,Early Exit Grace Period,Serdema Grace Exit zû
 DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
@@ -6778,6 +6807,7 @@
 DocType: Item Price,Item Price,Babetê Price
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Soap & Detergent,Sabûn &amp; Detergent
 DocType: BOM,Show Items,Show babetî
+apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Daxuyaniya Daxuyaniya Bacê ya {0} ji bo {1}
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.py,From Time cannot be greater than To Time.,Ji Time ne dikarin bibin mezintir To Time.
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Do you want to notify all the customers by email?,Ma hûn dixwazin ku hemî mişteriyan bi e-nameyê agahdar bikin?
 DocType: Subscription Plan,Billing Interval,Navendiya Navîn
@@ -6932,6 +6962,7 @@
 DocType: Budget,Warn,Gazîgîhandin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Hemû tiştên ku ji ber vê yekê ji bo Karê Karker ve hatibû veguhestin.
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
+DocType: Bank Account,Company Account,Hesabê şîrketê
 DocType: Asset Maintenance,Manufacturing User,manufacturing Bikarhêner
 DocType: Purchase Invoice,Raw Materials Supplied,Madeyên xav Supplied
 DocType: Subscription Plan,Payment Plan,Plana Payan
@@ -6973,6 +7004,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3},{0} ({1}) ji hêla plana plankirî ({2}) ji hêla Karê Karker {3}
 DocType: Certification Application,Name of Applicant,Navekî Serêdanê
 apps/erpnext/erpnext/config/manufacturing.py,Time Sheet for manufacturing.,Bîlançoya Time ji bo febrîkayan.
+DocType: Quick Stock Balance,Quick Stock Balance,Balyozxaneya Bilez Zû
 apps/erpnext/erpnext/templates/pages/cart.html,Subtotal,Subtotal
 apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change Variant properties after stock transaction. You will have to make a new Item to do this.,Ji ber veguhastina veberhênanên variant veguherînin nikare guhertin. Divê hûn nifşek nû çêbikin ku ev bikin.
 apps/erpnext/erpnext/config/integrations.py,GoCardless SEPA Mandate,Rêveberiya SEPA GoCardless
@@ -7295,6 +7327,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} Xwendekarê neçalak e
 DocType: Employee,Health Details,Details Health
+DocType: Coupon Code,Coupon Type,Tîpa Cupon
 DocType: Leave Encashment,Encashable days,Rojan nabe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Ji bo afirandina daxwaza Payment belge referansa pêwîst e
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,To create a Payment Request reference document is required,Ji bo afirandina daxwaza Payment belge referansa pêwîst e
@@ -7576,6 +7609,7 @@
 DocType: Hotel Room Package,Amenities,Amenities
 DocType: Accounts Settings,Automatically Fetch Payment Terms,Allyertên Dravê bixweber Bawer bikin
 DocType: QuickBooks Migrator,Undeposited Funds Account,Hesabê Hesabê Bêguman
+DocType: Coupon Code,Uses,Uses
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Multiple default mode of payment is not allowed,Modeya piralî ya pêdivî ye ku pêdivî ye
 DocType: Sales Invoice,Loyalty Points Redemption,Redemption Points
 ,Appointment Analytics,Analytics
@@ -7593,6 +7627,7 @@
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Vala bihêlin eger tu şaşiyekê komên xwendekarên her salê
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Vala bihêlin eger tu şaşiyekê komên xwendekarên her salê
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Eger kontrolkirin, Total tune. ji Xebatê Rojan wê de betlaneyên xwe, û em ê bi nirxê Salary Per Day kêm"
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Failed to add Domain,Domain nekêşand
 apps/erpnext/erpnext/controllers/status_updater.py,"To allow over receipt / delivery, update ""Over Receipt/Delivery Allowance"" in Stock Settings or the Item.","Ji bo destûrdayîn / teslîmkirina bihêlin, Di &quot;Settings Stock&quot; an &quot;Tiştê&quot; de &quot;Over Receipt / Allowance Delivery&quot; nûve bikin."
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,"Apps using current key won't be able to access, are you sure?","Vebijêrkên key-ê bikar bînin ku dê nikaribin gihîştin destûr, ma hûn rast bin?"
 DocType: Subscription Settings,Prorate,Prorate
@@ -7606,6 +7641,7 @@
 ,BOM Stock Report,BOM Stock Report
 DocType: Communication Medium,"If there is no assigned timeslot, then communication will be handled by this group","Ger demsalek nehatibe diyarkirin, wê hingê ragihandinê ji hêla vê komê ve were rêve birin"
 DocType: Stock Reconciliation Item,Quantity Difference,Cudahiya di Diravan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 DocType: Opportunity Item,Basic Rate,Rate bingehîn
 DocType: GL Entry,Credit Amount,Şêwaz Credit
 ,Electronic Invoice Register,Xeydêkerê Belavkirina Elektronîkî
@@ -7858,6 +7894,7 @@
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Bac û doz li dabirîn (Company Exchange)
 DocType: Item Group,General Settings,Mîhengên giştî
 DocType: Article,Article,Tişt
+apps/erpnext/erpnext/shopping_cart/cart.py,Please enter coupon code !!,Ji kerema xwe kodê kodê binivîse !!
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Ji Exchange û To Exchange ne dikarin heman
 DocType: Taxable Salary Slab,Percent Deduction,Perçûna Perê
 DocType: GL Entry,To Rename,Navnav kirin