Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite

erpnext/accounts/doctype/account/account.json

@@ -188,7 +188,6 @@
    "label": "Include in gross"
   },
   {
-   "bold": 1,
    "default": "0",
    "fieldname": "disabled",
    "fieldtype": "Check",
@@ -197,7 +196,7 @@
  ],
  "icon": "fa fa-money",
  "idx": 1,
- "modified": "2019-08-23 03:40:58.441295",
+ "modified": "2019-10-10 19:10:02.967554",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",

erpnext/accounts/doctype/coupon_code/coupon_code.js

@@ -0,0 +1,35 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Coupon Code', {
+	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);
+			});
+		}
+	}
+});

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -0,0 +1,175 @@
+{
+ "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": [
+  {
+   "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": "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"
+  },
+  {
+   "fieldname": "uses",
+   "fieldtype": "Section Break",
+   "label": "Uses"
+  },
+  {
+   "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-15 14:12:22.686986",
+ "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
+}

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."))

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()
+	]);
+
+});

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)
+
+
+

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -608,15 +608,9 @@ $.extend(erpnext.journal_entry, {
 	},
 
 	account_query: function(frm) {
-		var inter_company = 0;
-		if (frm.doc.voucher_type == "Inter Company Journal Entry") {
-			inter_company = 1;
-		}
-
 		var filters = {
 			company: frm.doc.company,
-			is_group: 0,
+			is_group: 0
-			inter_company_account: inter_company
 		};
 		if(!frm.doc.multi_currency) {
 			$.extend(filters, {

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -40,7 +40,7 @@
  "fields": [
   {
    "bold": 1,
-   "columns": 3,
+   "columns": 2,
    "fieldname": "account",
    "fieldtype": "Link",
    "in_global_search": 1,
@@ -90,14 +90,16 @@
    "fieldtype": "Column Break"
   },
   {
+   "default": "Customer",
    "fieldname": "party_type",
    "fieldtype": "Link",
+   "in_list_view": 1,
    "label": "Party Type",
    "options": "DocType",
    "search_index": 1
   },
   {
-   "columns": 3,
+   "columns": 2,
    "fieldname": "party",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
@@ -270,7 +272,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-09-12 12:16:17.588399",
+ "modified": "2019-10-02 12:23:21.693443",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -1045,7 +1045,7 @@ def make_payment_order(source_name, target_doc=None):
 
 	def update_item(source_doc, target_doc, source_parent):
 		target_doc.bank_account = source_parent.party_bank_account
-		target_doc.amount = source_parent.base_paid_amount
+		target_doc.amount = source_doc.allocated_amount
 		target_doc.account = source_parent.paid_to
 		target_doc.payment_entry = source_parent.name
 		target_doc.supplier = source_parent.party

erpnext/accounts/doctype/pricing_rule/pricing_rule.py

@@ -249,6 +249,9 @@ def get_pricing_rule_for_item(args, price_list_rate=0, doc=None):
 			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)

erpnext/accounts/doctype/pricing_rule/utils.py

@@ -531,4 +531,32 @@ def validate_pricing_rule_for_different_cond(doc):
 	for d in doc.get("items"):
 		validate_pricing_rule_on_items(doc, d, True)
 
-	return doc
+	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)

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -880,6 +880,17 @@ class PurchaseInvoice(BuyingController):
 		# calculate totals again after applying TDS
 		self.calculate_taxes_and_totals()
 
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Purchase Invoices'),
+	})
+	return list_context
+
 @frappe.whitelist()
 def make_debit_note(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc

erpnext/accounts/doctype/share_transfer/share_transfer.js

@@ -16,7 +16,7 @@ frappe.ui.form.on('Share Transfer', {
 				};
 			};
 		});
-		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);
 			});

erpnext/accounts/party.py

@@ -12,7 +12,7 @@ from frappe.utils import (add_days, getdate, formatdate, date_diff,
 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 @@ def validate_party_frozen_disabled(party_type, party_name):
 	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)

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' %}
+								{% if tdf.fieldname == 'qty' %}
-									<div class="value">{{ frappe.utils.fmt_money((d[tdf.fieldname])|int|abs, currency=doc.currency) }}</div></td>
+									<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 %}

erpnext/assets/doctype/asset/asset.py

@@ -20,12 +20,7 @@ class Asset(AccountsController):
 		self.validate_asset_values()
 		self.validate_item()
 		self.set_missing_values()
-		if self.calculate_depreciation:
+		self.prepare_depreciation_data()
-			self.set_depreciation_rate()
-			self.make_depreciation_schedule()
-			self.set_accumulated_depreciation()
-		else:
-			self.finance_books = []
 		if self.get("schedules"):
 			self.validate_expected_value_after_useful_life()
 
@@ -45,6 +40,17 @@ class Asset(AccountsController):
 		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)

erpnext/assets/doctype/asset/depreciation.py

@@ -188,7 +188,8 @@ def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None)
 				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 = [

erpnext/assets/report/fixed_asset_register/fixed_asset_register.js

@@ -16,8 +16,8 @@ frappe.query_reports["Fixed Asset Register"] = {
 			fieldname:"status",
 			label: __("Status"),
 			fieldtype: "Select",
-			options: "In Store\nDisposed",
+			options: "In Location\nDisposed",
-			default: 'In Store',
+			default: 'In Location',
 			reqd: 1
 		},
 		{

erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

@@ -101,7 +101,7 @@ def get_conditions(filters):
 
 	# In Store assets are those that are not sold or scrapped
 	operand = 'not in'
-	if status not in 'In Store':
+	if status not in 'In Location':
 		operand = 'in'
 
 	conditions['status'] = (operand, ['Sold', 'Scrapped'])

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -386,7 +386,21 @@ def make_purchase_receipt(source_name, target_doc=None):
 
 @frappe.whitelist()
 def make_purchase_invoice(source_name, target_doc=None):
+	return get_mapped_purchase_invoice(source_name, target_doc)
+
+@frappe.whitelist()
+def make_purchase_invoice_from_portal(purchase_order_name):
+	doc = get_mapped_purchase_invoice(purchase_order_name, ignore_permissions=True)
+	if doc.contact_email != frappe.session.user:
+		frappe.throw(_('Not Permitted'), frappe.PermissionError)
+	doc.save()
+	frappe.db.commit()
+	frappe.response['type'] = 'redirect'
+	frappe.response.location = '/purchase-invoices/' + doc.name
+
+def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions=False):
 	def postprocess(source, target):
+		target.flags.ignore_permissions = ignore_permissions
 		set_missing_values(source, target)
 		#Get the advance paid Journal Entries in Purchase Invoice Advance
 
@@ -437,7 +451,8 @@ def make_purchase_invoice(source_name, target_doc=None):
 			"add_if_empty": True
 		}
 
-	doc = get_mapped_doc("Purchase Order", source_name,	fields, target_doc, postprocess)
+	doc = get_mapped_doc("Purchase Order", source_name,	fields,
+		target_doc, postprocess, ignore_permissions=ignore_permissions)
 
 	return doc
 
@@ -501,6 +516,17 @@ def get_item_details(items):
 
 	return item_details
 
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Purchase Orders'),
+	})
+	return list_context
+
 @frappe.whitelist()
 def update_status(status, name):
 	po = frappe.get_doc("Purchase Order", name)

erpnext/buying/doctype/purchase_order/test_purchase_order.py

@@ -589,6 +589,23 @@ class TestPurchaseOrder(unittest.TestCase):
 		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

erpnext/buying/doctype/supplier/test_supplier.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 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 @@ class TestSupplier(unittest.TestCase):
 
         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)
 

erpnext/controllers/accounts_controller.py

@@ -606,8 +606,13 @@ class AccountsController(TransactionBase):
 
 					max_allowed_amt = flt(ref_amt * (100 + allowance) / 100)
 
+					if total_billed_amt < 0 and max_allowed_amt < 0:
+						# while making debit note against purchase return entry(purchase receipt) getting overbill error
+						total_billed_amt = abs(total_billed_amt)
+						max_allowed_amt = abs(max_allowed_amt)
+
 					if total_billed_amt - max_allowed_amt > 0.01:
-						frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Stock Settings")
+						frappe.throw(_("Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings")
 							.format(item.item_code, item.idx, max_allowed_amt))
 
 	def get_company_default(self, fieldname):
@@ -1195,10 +1200,22 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 			child_item.rate = flt(d.get("rate"))
 
 		if flt(child_item.price_list_rate):
-			discount = flt((1 - flt(child_item.rate) / flt(child_item.price_list_rate)) * 100.0,
+			if flt(child_item.rate) > flt(child_item.price_list_rate):
-				child_item.precision("discount_percentage"))
+				#  if rate is greater than price_list_rate, set margin
-			if discount > 0:
+				#  or set discount
-				child_item.discount_percentage = 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
+			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
 
 		child_item.flags.ignore_validate_update_after_submit = True
 		if new_child_flag:
@@ -1211,6 +1228,8 @@ def update_child_qty_rate(parent_doctype, trans_items, parent_doctype_name, chil
 	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)
 

erpnext/controllers/buying_controller.py

@@ -695,8 +695,10 @@ class BuyingController(StockController):
 	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'):

erpnext/controllers/status_updater.py

@@ -37,9 +37,9 @@ status_map = {
 	"Sales Order": [
 		["Draft", None],
 		["To Deliver and Bill", "eval:self.per_delivered < 100 and self.per_billed < 100 and self.docstatus == 1"],
-		["To Bill", "eval:self.per_delivered == 100 and self.per_billed < 100 and self.docstatus == 1"],
+		["To Bill", "eval:(self.per_delivered == 100 or self.skip_delivery_note) and self.per_billed < 100 and self.docstatus == 1"],
-		["To Deliver", "eval:self.per_delivered < 100 and self.per_billed == 100 and self.docstatus == 1"],
+		["To Deliver", "eval:self.per_delivered < 100 and self.per_billed == 100 and self.docstatus == 1 and not self.skip_delivery_note"],
-		["Completed", "eval:self.per_delivered == 100 and self.per_billed == 100 and self.docstatus == 1"],
+		["Completed", "eval:(self.per_delivered == 100 or self.skip_delivery_note) and self.per_billed == 100 and self.docstatus == 1"],
 		["Cancelled", "eval:self.docstatus==2"],
 		["Closed", "eval:self.status=='Closed'"],
 		["On Hold", "eval:self.status=='On Hold'"],

erpnext/controllers/trends.py

@@ -140,6 +140,8 @@ def period_wise_columns_query(filters, trans):
 
 	if trans in ['Purchase Receipt', 'Delivery Note', 'Purchase Invoice', 'Sales Invoice']:
 		trans_date = 'posting_date'
+		if filters.period_based_on:
+			trans_date = filters.period_based_on
 	else:
 		trans_date = 'transaction_date'
 

erpnext/controllers/website_list_for_contact.py

@@ -25,7 +25,7 @@ def get_transaction_list(doctype, txt=None, filters=None, limit_start=0, limit_p
 
 	if not filters: filters = []
 
-	if doctype == 'Supplier Quotation':
+	if doctype in ['Supplier Quotation', 'Purchase Invoice']:
 		filters.append((doctype, 'docstatus', '<', 2))
 	else:
 		filters.append((doctype, 'docstatus', '=', 1))
@@ -175,4 +175,4 @@ def get_customer_field_name(doctype):
 	if doctype == 'Quotation':
 		return 'party_name'
 	else:
-		return 'customer'
+		return 'customer'

erpnext/crm/doctype/lead/lead.py

@@ -146,14 +146,7 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
 	def set_missing_values(source, target):
-		address = frappe.get_all('Dynamic Link', {
+		_set_missing_values(source, target)
-			'link_doctype': source.doctype,
-			'link_name': source.name,
-			'parenttype': 'Address',
-		}, ['parent'], limit=1)
-
-		if address:
-			target.customer_address = address[0].parent
 
 	target_doc = get_mapped_doc("Lead", source_name,
 		{"Lead": {
@@ -173,13 +166,17 @@ def make_opportunity(source_name, target_doc=None):
 
 @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 @@ def make_quotation(source_name, target_doc=None):
 
 	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 {}

erpnext/crm/doctype/opportunity/opportunity.js

@@ -167,7 +167,7 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 		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']);
 		}
 	},

erpnext/crm/doctype/utils.py

@@ -17,7 +17,7 @@ def get_last_interaction(contact=None, lead=None):
 			if link.link_doctype == 'Customer':
 				last_issue = get_last_issue_from_customer(link.link_name)
 			query_condition += "(`reference_doctype`=%s AND `reference_name`=%s) OR"
-			values += [link_link_doctype, link_link_name]
+			values += [link.link_doctype, link.link_name]
 
 		if query_condition:
 			# remove extra appended 'OR'

erpnext/exceptions.py

@@ -5,3 +5,4 @@ import frappe
 class PartyFrozen(frappe.ValidationError): pass
 class InvalidAccountCurrency(frappe.ValidationError): pass
 class InvalidCurrency(frappe.ValidationError): pass
+class PartyDisabled(frappe.ValidationError):pass

erpnext/healthcare/page/patient_history/patient_history.js

@@ -234,7 +234,7 @@ var show_patient_vital_charts = function(patient, me, btn_show_id, pts, title) {
 				<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 @@ var show_patient_vital_charts = function(patient, me, btn_show_id, pts, title) {
 					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 @@ var show_patient_vital_charts = function(patient, me, btn_show_id, pts, title) {
 
 					title: title,
 					type: 'axis-mixed', // 'axis-mixed', 'bar', 'line', 'pie', 'percentage'
-					height: 150,
+					height: 200,
 					colors: ['purple', '#ffa3ef', 'light-blue'],
 
 					tooltipOptions: {

erpnext/hooks.py

@@ -45,7 +45,10 @@ update_and_get_user_progress = "erpnext.utilities.user_progress_utils.update_def
 leaderboards = "erpnext.startup.leaderboard.get_leaderboards"
 
 
-on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
+on_session_creation = [
+	"erpnext.portal.utils.create_customer_or_supplier",
+	"erpnext.shopping_cart.utils.set_cart_count"
+]
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
 
 treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', 'Assessment Group', 'Department']
@@ -102,6 +105,20 @@ website_route_rules = [
 			"parents": [{"label": _("Supplier Quotation"), "route": "supplier-quotations"}]
 		}
 	},
+	{"from_route": "/purchase-orders", "to_route": "Purchase Order"},
+	{"from_route": "/purchase-orders/<path:name>", "to_route": "order",
+		"defaults": {
+			"doctype": "Purchase Order",
+			"parents": [{"label": _("Purchase Order"), "route": "purchase-orders"}]
+		}
+	},
+	{"from_route": "/purchase-invoices", "to_route": "Purchase Invoice"},
+	{"from_route": "/purchase-invoices/<path:name>", "to_route": "order",
+		"defaults": {
+			"doctype": "Purchase Invoice",
+			"parents": [{"label": _("Purchase Invoice"), "route": "purchase-invoices"}]
+		}
+	},
 	{"from_route": "/quotations", "to_route": "Quotation"},
 	{"from_route": "/quotations/<path:name>", "to_route": "order",
 		"defaults": {
@@ -148,6 +165,8 @@ standard_portal_menu_items = [
 	{"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
 	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation", "role": "Supplier"},
 	{"title": _("Supplier Quotation"), "route": "/supplier-quotations", "reference_doctype": "Supplier Quotation", "role": "Supplier"},
+	{"title": _("Purchase Orders"), "route": "/purchase-orders", "reference_doctype": "Purchase Order", "role": "Supplier"},
+	{"title": _("Purchase Invoices"), "route": "/purchase-invoices", "reference_doctype": "Purchase Invoice", "role": "Supplier"},
 	{"title": _("Quotations"), "route": "/quotations", "reference_doctype": "Quotation", "role":"Customer"},
 	{"title": _("Orders"), "route": "/orders", "reference_doctype": "Sales Order", "role":"Customer"},
 	{"title": _("Invoices"), "route": "/invoices", "reference_doctype": "Sales Invoice", "role":"Customer"},
@@ -160,8 +179,8 @@ standard_portal_menu_items = [
 	{"title": _("Patient Appointment"), "route": "/patient-appointments", "reference_doctype": "Patient Appointment", "role":"Patient"},
 	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"},
 	{"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
-	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"},
+	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission", "role": "Student"},
-	{"title": _("Certification"), "route": "/certification", "reference_doctype": "Certification Application"},
+	{"title": _("Certification"), "route": "/certification", "reference_doctype": "Certification Application", "role": "Non Profit Portal User"},
 	{"title": _("Material Request"), "route": "/material-requests", "reference_doctype": "Material Request", "role": "Customer"},
 ]
 
@@ -181,6 +200,8 @@ has_website_permission = {
 	"Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Supplier Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Purchase Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Purchase Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Material Request": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission",

erpnext/hr/doctype/driver/driver.js

@@ -1,14 +1,36 @@
 // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Driver', {
+frappe.ui.form.on("Driver", {
 	setup: function(frm) {
-		frm.set_query('transporter', function(){
+		frm.set_query("transporter", function() {
 			return {
 				filters: {
-					'is_transporter': 1
+					is_transporter: 1
 				}
 			};
 		});
+	},
+
+	refresh: function(frm) {
+		frm.set_query("address", function() {
+			return {
+				filters: {
+					is_your_company_address: !frm.doc.transporter ? 1 : 0
+				}
+			};
+		});
+	},
+
+	transporter: function(frm, cdt, cdn) {
+		// this assumes that supplier's address has same title as supplier's name
+		frappe.db
+			.get_doc("Address", null, { address_title: frm.doc.transporter })
+			.then(r => {
+				frappe.model.set_value(cdt, cdn, "address", r.name);
+			})
+			.catch(err => {
+				console.log(err);
+			});
 	}
 });

erpnext/hr/doctype/leave_application/leave_application.py

@@ -404,8 +404,11 @@ def get_number_of_leave_days(employee, leave_type, from_date, to_date, half_day
 	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
 
@@ -549,8 +552,16 @@ def get_leaves_for_period(employee, leave_type, from_date, to_date):
 			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 +573,7 @@ def skip_expiry_leaves(leave_entry, date):
 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

erpnext/hr/doctype/salary_slip/salary_slip.py

@@ -255,16 +255,19 @@ class SalarySlip(TransactionBase):
 		for d in range(working_days):
 			dt = add_days(cstr(getdate(self.start_date)), d)
 			leave = frappe.db.sql("""
-				select t1.name, t1.half_day
+				SELECT t1.name,
-				from `tabLeave Application` t1, `tabLeave Type` t2
+					CASE WHEN t1.half_day_date = %(dt)s or t1.to_date = t1.from_date
-				where t2.name = t1.leave_type
+					THEN t1.half_day else 0 END
-				and t2.is_lwp = 1
+				FROM `tabLeave Application` t1, `tabLeave Type` t2
-				and t1.docstatus = 1
+				WHERE t2.name = t1.leave_type
-				and t1.employee = %(employee)s
+				AND t2.is_lwp = 1
-				and CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
+				AND t1.docstatus = 1
+				AND t1.employee = %(employee)s
+				AND CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
 				WHEN t2.include_holiday THEN %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
 				END
 				""".format(holidays), {"employee": self.employee, "dt": dt})
+
 			if leave:
 				lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1)
 		return lwp

erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js

@@ -4,6 +4,17 @@
 frappe.provide("erpnext.maintenance");
 
 frappe.ui.form.on('Maintenance Visit', {
+	refresh: function(frm) {
+		//filters for serial_no based on item_code
+		frm.set_query('serial_no', 'purposes', function(frm, cdt, cdn) {
+			let item = locals[cdt][cdn];
+			return {
+				filters: {
+					'item_code': item.item_code
+				}
+			};
+		});
+	},
 	setup: function(frm) {
 		frm.set_query('contact_person', erpnext.queries.contact_query);
 		frm.set_query('customer_address', erpnext.queries.address_query);

erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json

@@ -1,348 +1,137 @@
 {
- "allow_copy": 0, 
+ "autoname": "hash",
- "allow_import": 0, 
+ "creation": "2013-02-22 01:28:06",
- "allow_rename": 0, 
+ "doctype": "DocType",
- "autoname": "hash", 
+ "document_type": "Document",
- "beta": 0, 
+ "editable_grid": 1,
- "creation": "2013-02-22 01:28:06", 
+ "engine": "InnoDB",
- "custom": 0, 
+ "field_order": [
- "docstatus": 0, 
+  "item_code",
- "doctype": "DocType", 
+  "item_name",
- "document_type": "Document", 
+  "serial_no",
- "editable_grid": 1, 
+  "description",
- "engine": "InnoDB", 
+  "work_details",
+  "service_person",
+  "work_done",
+  "prevdoc_doctype",
+  "prevdoc_docname",
+  "prevdoc_detail_docname"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
+   "fieldname": "item_code",
-   "bold": 0, 
+   "fieldtype": "Link",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Item Code",
-   "fieldname": "item_code", 
+   "oldfieldname": "item_code",
-   "fieldtype": "Link", 
+   "oldfieldtype": "Link",
-   "hidden": 0, 
+   "options": "Item"
-   "ignore_user_permissions": 0, 
+  },
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_code", 
-   "oldfieldtype": "Link", 
-   "options": "Item", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fetch_from": "item_code.item_name",
-   "bold": 0, 
+   "fieldname": "item_name",
-   "collapsible": 0, 
+   "fieldtype": "Data",
-   "columns": 0, 
+   "in_global_search": 1,
-   "fieldname": "item_name", 
+   "in_list_view": 1,
-   "fieldtype": "Data", 
+   "label": "Item Name",
-   "hidden": 0, 
+   "oldfieldname": "item_name",
-   "ignore_user_permissions": 0, 
+   "oldfieldtype": "Data",
-   "ignore_xss_filter": 0, 
+   "read_only": 1
-   "in_filter": 0, 
+  },
-   "in_global_search": 1, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fieldname": "serial_no",
-   "bold": 0, 
+   "fieldtype": "Link",
-   "collapsible": 0, 
+   "label": "Serial No",
-   "columns": 0, 
+   "oldfieldname": "serial_no",
-   "fieldname": "serial_no", 
+   "oldfieldtype": "Small Text",
-   "fieldtype": "Small Text", 
+   "options": "Serial No"
-   "hidden": 0, 
+  },
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Serial No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "serial_no", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fieldname": "description",
-   "bold": 0, 
+   "fieldtype": "Text Editor",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Description",
-   "fieldname": "description", 
+   "oldfieldname": "description",
-   "fieldtype": "Text Editor", 
+   "oldfieldtype": "Small Text",
-   "hidden": 0, 
+   "print_width": "300px",
-   "ignore_user_permissions": 0, 
+   "reqd": 1,
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "description", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
    "width": "300px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
+   "fieldname": "work_details",
-   "bold": 0, 
+   "fieldtype": "Section Break"
-   "collapsible": 0, 
+  },
-   "columns": 0, 
-   "fieldname": "work_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fieldname": "service_person",
-   "bold": 0, 
+   "fieldtype": "Link",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Sales Person",
-   "fieldname": "service_person", 
+   "oldfieldname": "service_person",
-   "fieldtype": "Link", 
+   "oldfieldtype": "Link",
-   "hidden": 0, 
+   "options": "Sales Person",
-   "ignore_user_permissions": 0, 
+   "reqd": 1
-   "ignore_xss_filter": 0, 
+  },
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Sales Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "service_person", 
-   "oldfieldtype": "Link", 
-   "options": "Sales Person", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fieldname": "work_done",
-   "bold": 0, 
+   "fieldtype": "Small Text",
-   "collapsible": 0, 
+   "in_list_view": 1,
-   "columns": 0, 
+   "label": "Work Done",
-   "fieldname": "work_done", 
+   "oldfieldname": "work_done",
-   "fieldtype": "Small Text", 
+   "oldfieldtype": "Small Text",
-   "hidden": 0, 
+   "reqd": 1
-   "ignore_user_permissions": 0, 
+  },
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Work Done", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "work_done", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
   {
-   "allow_on_submit": 0, 
+   "fieldname": "prevdoc_doctype",
-   "bold": 0, 
+   "fieldtype": "Link",
-   "collapsible": 0, 
+   "label": "Document Type",
-   "columns": 0, 
+   "no_copy": 1,
-   "fieldname": "prevdoc_doctype", 
+   "oldfieldname": "prevdoc_doctype",
-   "fieldtype": "Link", 
+   "oldfieldtype": "Data",
-   "hidden": 0, 
+   "options": "DocType",
-   "ignore_user_permissions": 0, 
+   "print_hide": 1,
-   "ignore_xss_filter": 0, 
+   "print_width": "150px",
-   "in_filter": 0, 
+   "read_only": 1,
-   "in_global_search": 0, 
+   "report_hide": 1,
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Document Type", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_doctype", 
-   "oldfieldtype": "Data", 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
    "width": "150px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
+   "fieldname": "prevdoc_docname",
-   "bold": 0, 
+   "fieldtype": "Dynamic Link",
-   "collapsible": 0, 
+   "label": "Against Document No",
-   "columns": 0, 
+   "no_copy": 1,
-   "fieldname": "prevdoc_docname", 
+   "oldfieldname": "prevdoc_docname",
-   "fieldtype": "Dynamic Link", 
+   "oldfieldtype": "Data",
-   "hidden": 0, 
+   "options": "prevdoc_doctype",
-   "ignore_user_permissions": 0, 
+   "print_hide": 1,
-   "ignore_xss_filter": 0, 
+   "print_width": "160px",
-   "in_filter": 0, 
+   "read_only": 1,
-   "in_global_search": 0, 
+   "report_hide": 1,
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Against Document No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Data", 
-   "options": "prevdoc_doctype", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "160px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
    "width": "160px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
+   "fieldname": "prevdoc_detail_docname",
-   "bold": 0, 
+   "fieldtype": "Data",
-   "collapsible": 0, 
+   "hidden": 1,
-   "columns": 0, 
+   "label": "Against Document Detail No",
-   "fieldname": "prevdoc_detail_docname", 
+   "no_copy": 1,
-   "fieldtype": "Data", 
+   "oldfieldname": "prevdoc_detail_docname",
-   "hidden": 1, 
+   "oldfieldtype": "Data",
-   "ignore_user_permissions": 0, 
+   "print_hide": 1,
-   "ignore_xss_filter": 0, 
+   "print_width": "160px",
-   "in_filter": 0, 
+   "read_only": 1,
-   "in_global_search": 0, 
+   "report_hide": 1,
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Against Document Detail No", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "prevdoc_detail_docname", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "160px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 1, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
    "width": "160px"
   }
- ], 
+ ],
- "hide_heading": 0, 
+ "idx": 1,
- "hide_toolbar": 0, 
+ "istable": 1,
- "idx": 1, 
+ "modified": "2019-10-03 14:55:52.786805",
- "image_view": 0, 
+ "modified_by": "Administrator",
- "in_create": 0, 
+ "module": "Maintenance",
-
+ "name": "Maintenance Visit Purpose",
- "is_submittable": 0, 
+ "owner": "ashwini@webnotestech.com",
- "issingle": 0, 
+ "permissions": [],
- "istable": 1, 
+ "sort_field": "modified",
- "max_attachments": 0, 
+ "sort_order": "DESC",
- "modified": "2017-02-17 17:06:11.910266", 
+ "track_changes": 1
- "modified_by": "Administrator", 
- "module": "Maintenance", 
- "name": "Maintenance Visit Purpose", 
- "owner": "ashwini@webnotestech.com", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "track_changes": 1, 
- "track_seen": 0
 }

erpnext/manufacturing/doctype/bom/bom.js

@@ -117,7 +117,7 @@ frappe.ui.form.on("BOM", {
 			args: {
 				update_parent: true,
 				from_child_bom:false,
-				save: false
+				save: frm.doc.docstatus === 1 ? true : false
 			},
 			callback: function(r) {
 				refresh_field("items");

erpnext/manufacturing/doctype/production_plan/production_plan.py

@@ -558,7 +558,7 @@ def get_sales_orders(self):
 		item_filter += " and so_item.item_code = %(item)s"
 
 	open_so = frappe.db.sql("""
-		select distinct so.name, so.transaction_date, so.customer, so.base_grand_total
+		select distinct so.name, so.transaction_date, so.customer, so.base_grand_total as grand_total
 		from `tabSales Order` so, `tabSales Order Item` so_item
 		where so_item.parent = so.name
 			and so.docstatus = 1 and so.status not in ("Stopped", "Closed")

erpnext/manufacturing/doctype/work_order/work_order.py

@@ -64,7 +64,8 @@ class WorkOrder(Document):
 				from `tabSales Order` so
 				inner join `tabSales Order Item` so_item on so_item.parent = so.name
 				left join `tabProduct Bundle Item` pk_item on so_item.item_code = pk_item.parent
-				where so.name=%s and so.docstatus = 1 and (
+				where so.name=%s and so.docstatus = 1
+					and so.skip_delivery_note  = 0 and (
 					so_item.item_code=%s or
 					pk_item.item_code=%s )
 			""", (self.sales_order, self.production_item, self.production_item), as_dict=1)
@@ -78,6 +79,7 @@ class WorkOrder(Document):
 					where so.name=%s
 						and so.name=so_item.parent
 						and so.name=packed_item.parent
+						and so.skip_delivery_note = 0
 						and so_item.item_code = packed_item.parent_item
 						and so.docstatus = 1 and packed_item.item_code=%s
 				""", (self.sales_order, self.production_item), as_dict=1)
@@ -477,6 +479,9 @@ class WorkOrder(Document):
 						'include_item_in_manufacturing': item.include_item_in_manufacturing
 					})
 
+					if not self.project:
+						self.project = item.get("project")
+
 			self.set_available_qty()
 
 	def update_transaferred_qty_for_required_items(self):

erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py

@@ -41,7 +41,9 @@ def execute():
 		item = frappe.get_doc("Item", item_code)
 		item.set("taxes", [])
 		item.append("taxes", {"item_tax_template": item_tax_template_name, "tax_category": ""})
-		item.save()
+		frappe.db.sql("delete from `tabItem Tax` where parent=%s and parenttype='Item'", item_code)
+		for d in item.taxes:
+			d.db_insert()
 
 	doctypes = [
 		'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice',

erpnext/portal/utils.py

@@ -1,5 +1,8 @@
 from __future__ import unicode_literals
 import frappe
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
+from erpnext.shopping_cart.cart import get_debtors_account
+from frappe.utils.nestedset import get_root_of
 
 def set_default_role(doc, method):
 	'''Set customer, supplier, student, guardian based on email'''
@@ -21,3 +24,88 @@ def set_default_role(doc, method):
 		doc.add_roles('Student')
 	elif frappe.get_value('Guardian', dict(email_address=doc.email)) and 'Guardian' not in roles:
 		doc.add_roles('Guardian')
+
+def create_customer_or_supplier():
+	'''Based on the default Role (Customer, Supplier), create a Customer / Supplier.
+	Called on_session_creation hook.
+	'''
+	user = frappe.session.user
+
+	if frappe.db.get_value('User', user, 'user_type') != 'Website User':
+		return
+
+	user_roles = frappe.get_roles()
+	portal_settings = frappe.get_single('Portal Settings')
+	default_role = portal_settings.default_role
+
+	if default_role not in ['Customer', 'Supplier']:
+		return
+
+	# create customer / supplier if the user has that role
+	if portal_settings.default_role and portal_settings.default_role in user_roles:
+		doctype = portal_settings.default_role
+	else:
+		doctype = None
+
+	if not doctype:
+		return
+
+	if party_exists(doctype, user):
+		return
+
+	party = frappe.new_doc(doctype)
+	fullname = frappe.utils.get_fullname(user)
+
+	if doctype == 'Customer':
+		cart_settings = get_shopping_cart_settings()
+
+		if cart_settings.enable_checkout:
+			debtors_account = get_debtors_account(cart_settings)
+		else:
+			debtors_account = ''
+
+		party.update({
+			"customer_name": fullname,
+			"customer_type": "Individual",
+			"customer_group": cart_settings.default_customer_group,
+			"territory": get_root_of("Territory")
+		})
+
+		if debtors_account:
+			party.update({
+				"accounts": [{
+					"company": cart_settings.company,
+					"account": debtors_account
+				}]
+			})
+	else:
+		party.update({
+			"supplier_name": fullname,
+			"supplier_group": "All Supplier Groups",
+			"supplier_type": "Individual"
+		})
+
+	party.flags.ignore_mandatory = True
+	party.insert(ignore_permissions=True)
+
+	contact = frappe.new_doc("Contact")
+	contact.update({
+		"first_name": fullname,
+		"email_id": user
+	})
+	contact.append('links', dict(link_doctype=doctype, link_name=party.name))
+	contact.flags.ignore_mandatory = True
+	contact.insert(ignore_permissions=True)
+
+	return party
+
+
+def party_exists(doctype, user):
+	contact_name = frappe.db.get_value("Contact", {"email_id": user})
+
+	if contact_name:
+		contact = frappe.get_doc('Contact', contact_name)
+		doctypes = [d.link_doctype for d in contact.links]
+		return doctype in doctypes
+
+	return False

erpnext/public/js/controllers/transaction.js

@@ -1233,7 +1233,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 			"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
 		};
 	},
 
@@ -1742,6 +1743,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 				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()
+		]);
 	}
 });
 

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 @@ frappe.ready(function() {
 		$('.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();

erpnext/public/scss/website.scss

@@ -51,3 +51,30 @@
 	width: 24px;
 	height: 24px;
 }
+
+.website-list .result {
+	margin-top: 2rem;
+}
+
+.result {
+	border-bottom: 1px solid $border-color;
+}
+
+.transaction-list-item {
+	padding: 1rem 0;
+	border-top: 1px solid $border-color;
+	position: relative;
+
+	a.transaction-item-link {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		text-decoration: none;
+		opacity: 0;
+		overflow: hidden;
+		text-indent: -9999px;
+		z-index: 0;
+	}
+}

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) {
+
+	// }
+});

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
+}

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

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

erpnext/regional/india/address_template.html

@@ -1,6 +1,6 @@
 {{ address_line1 }}<br>{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}{{ city }}<br>
-{% if gst_state %}{{ gst_state }}{% endif -%},
+{% if gst_state %}{{ gst_state }}{% endif -%}
-{% if gst_state_number %}State Code: {{ gst_state_number }}<br>{% endif -%}
+{% if gst_state_number %}, State Code: {{ gst_state_number }}<br>{% endif -%}
 {% if pincode %}PIN: {{ pincode }}<br>{% endif -%}
 {{ country }}<br>
 {% if phone %}Phone: {{ phone }}<br>{% endif -%}

erpnext/regional/italy/utils.py

@@ -151,8 +151,7 @@ def get_invoice_summary(items, taxes):
 						tax_rate=tax.rate,
 						tax_amount=(reference_row.tax_amount * tax.rate) / 100,
 						net_amount=reference_row.tax_amount,
-						taxable_amount=(reference_row.tax_amount if tax.charge_type == 'On Previous Row Amount'
+						taxable_amount=reference_row.tax_amount,
-							else reference_row.total),
 						item_tax_rate={tax.account_head: tax.rate},
 						charges=True
 					)
@@ -177,6 +176,10 @@ def get_invoice_summary(items, taxes):
 						summary_data[key]["tax_exemption_reason"] = tax.tax_exemption_reason
 						summary_data[key]["tax_exemption_law"] = tax.tax_exemption_law
 
+			if summary_data.get("0.0") and tax.charge_type in ["On Previous Row Total",
+				"On Previous Row Amount"]:
+				summary_data[key]["taxable_amount"] = tax.total
+
 			if summary_data == {}: #Implies that Zero VAT has not been set on any item.
 				summary_data.setdefault("0.0", {"tax_amount": 0.0, "taxable_amount": tax.total,
 					"tax_exemption_reason": tax.tax_exemption_reason, "tax_exemption_law": tax.tax_exemption_law})

erpnext/regional/report/datev/datev.py

@@ -8,6 +8,7 @@ Provide a report and downloadable CSV according to the German DATEV format.
   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 @@ import pandas as pd
 
 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):
+def validate(filters):
-	"""Make sure all mandatory filters are present."""
+	"""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 @@ def get_gl_entries(filters, as_dict):
 	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 @@ def get_datev_csv(data):
 	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 @@ def get_datev_csv(data):
 		columns=columns
 	)
 
+	return header + b'\r\n' + data
 
 @frappe.whitelist()
 def download_datev_csv(filters=None):
@@ -359,15 +437,9 @@ def download_datev_csv(filters=None):
 	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(
+	frappe.response['result'] = get_datev_csv(data, filters)
-		filters.get('company'),
+	frappe.response['doctype'] = 'EXTF_Buchungsstapel'
-		filters.get('from_date'),
-		filters.get('to_date')
-	)
-
-	frappe.response['result'] = get_datev_csv(data)
-	frappe.response['doctype'] = filename
 	frappe.response['type'] = 'csv'

erpnext/selling/doctype/customer/test_customer.py

@@ -8,7 +8,7 @@ import unittest
 
 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 @@ class TestCustomer(unittest.TestCase):
 
 		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)
 

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,
@@ -1920,6 +1920,74 @@
      "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": "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,
@@ -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",

erpnext/selling/doctype/quotation/quotation.py

@@ -142,6 +142,9 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
 		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")

erpnext/selling/doctype/sales_order/sales_order.js

@@ -136,7 +136,8 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 			if(doc.status !== 'Closed') {
 				if(doc.status !== 'On Hold') {
 
-					allow_delivery = this.frm.doc.items.some(item => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty))
+					allow_delivery = this.frm.doc.items.some(item => item.delivered_by_supplier === 0 && item.qty > flt(item.delivered_qty)) 
+						&& !this.frm.doc.skip_delivery_note
 
 					if (this.frm.has_perm("submit")) {
 						if(flt(doc.per_delivered, 6) < 100 || flt(doc.per_billed) < 100) {
@@ -341,7 +342,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 	},
 
 	order_type: function() {
-		this.frm.fields_dict.items.grid.toggle_reqd("delivery_date", this.frm.doc.order_type == "Sales");
+		this.toggle_delivery_date();
 	},
 
 	tc_name: function() {
@@ -355,6 +356,15 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend(
 		})
 	},
 
+	skip_delivery_note: function() {
+		this.toggle_delivery_date();
+	},
+
+	toggle_delivery_date: function() {
+		this.frm.fields_dict.items.grid.toggle_reqd("delivery_date", 
+			(this.frm.doc.order_type == "Sales" && !this.frm.doc.skip_delivery_note));
+	},
+
 	make_raw_material_request: function() {
 		var me = this;
 		this.frm.call({

erpnext/selling/doctype/sales_order/sales_order.json

@@ -14,6 +14,7 @@
   "customer",
   "customer_name",
   "order_type",
+  "skip_delivery_note",
   "column_break1",
   "amended_from",
   "company",
@@ -78,6 +79,7 @@
   "loyalty_points",
   "loyalty_amount",
   "section_break_48",
+  "coupon_code",
   "apply_discount_on",
   "base_discount_amount",
   "column_break_50",
@@ -252,6 +254,7 @@
   },
   {
    "allow_on_submit": 1,
+   "depends_on": "eval:!doc.skip_delivery_note",
    "fieldname": "delivery_date",
    "fieldtype": "Date",
    "in_list_view": 1,
@@ -676,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",
@@ -1023,7 +1032,7 @@
    "print_hide": 1
   },
   {
-   "depends_on": "eval:!doc.__islocal",
+   "depends_on": "eval:!doc.__islocal && !doc.skip_delivery_note_creation",
    "description": "% of materials delivered against this Sales Order",
    "fieldname": "per_delivered",
    "fieldtype": "Percent",
@@ -1171,12 +1180,19 @@
    "fieldtype": "Data",
    "label": "Phone",
    "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "skip_delivery_note",
+   "fieldtype": "Check",
+   "label": "Skip Delivery Note",
+   "print_hide": 1
   }
  ],
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-09-27 14:23:52.233323",
+ "modified": "2019-10-14 08:46:07.540565",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
@@ -1253,4 +1269,4 @@
  "title_field": "title",
  "track_changes": 1,
  "track_seen": 1
-}
+}

erpnext/selling/doctype/sales_order/sales_order.py

@@ -46,6 +46,10 @@ class SalesOrder(SellingController):
 		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)
 
@@ -57,13 +61,13 @@ class SalesOrder(SellingController):
 
 	def validate_po(self):
 		# validate p.o date v/s delivery date
-		if self.po_date:
+		if self.po_date and not self.skip_delivery_note:
 			for d in self.get("items"):
 				if d.delivery_date and getdate(self.po_date) > getdate(d.delivery_date):
 					frappe.throw(_("Row #{0}: Expected Delivery Date cannot be before Purchase Order Date")
 						.format(d.idx))
 
-		if self.po_no and self.customer:
+		if self.po_no and self.customer and not self.skip_delivery_note:
 			so = frappe.db.sql("select name from `tabSales Order` \
 				where ifnull(po_no, '') = %s and name != %s and docstatus < 2\
 				and customer = %s", (self.po_no, self.name, self.customer))
@@ -100,7 +104,7 @@ class SalesOrder(SellingController):
 		super(SalesOrder, self).validate_order_type()
 
 	def validate_delivery_date(self):
-		if self.order_type == 'Sales':
+		if self.order_type == 'Sales' and not self.skip_delivery_note:
 			delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]
 			max_delivery_date = max(delivery_date_list) if delivery_date_list else None
 			if not self.delivery_date:
@@ -177,6 +181,9 @@ class SalesOrder(SellingController):
 		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,7 +202,10 @@ class SalesOrder(SellingController):
 		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":
 			return
@@ -760,6 +770,7 @@ def get_events(start, end, filters=None):
 		from
 			`tabSales Order`, `tabSales Order Item`
 		where `tabSales Order`.name = `tabSales Order Item`.parent
+			and `tabSales Order`.skip_delivery_note = 0
 			and (ifnull(`tabSales Order Item`.delivery_date, '0000-00-00')!= '0000-00-00') \
 			and (`tabSales Order Item`.delivery_date between %(start)s and %(end)s)
 			and `tabSales Order`.docstatus < 2

erpnext/selling/doctype/sales_order/sales_order_list.js

@@ -1,58 +1,41 @@
 frappe.listview_settings['Sales Order'] = {
 	add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date",
-		"per_delivered", "per_billed", "status", "order_type", "name"],
+		"per_delivered", "per_billed", "status", "order_type", "name", "skip_delivery_note"],
 	get_indicator: function (doc) {
 		if (doc.status === "Closed") {
+			// Closed
 			return [__("Closed"), "green", "status,=,Closed"];
-
 		} else if (doc.status === "On Hold") {
 			// on hold
 			return [__("On Hold"), "orange", "status,=,On Hold"];
-		} else if (doc.order_type !== "Maintenance"
+		} else if (doc.status === "Completed") {
-			&& flt(doc.per_delivered, 6) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) {
+			return [__("Completed"), "green", "status,=,Completed"];
+		} else if (!doc.skip_delivery_note && flt(doc.per_delivered, 6) < 100) {
+			if (frappe.datetime.get_diff(doc.delivery_date) < 0) {
 			// not delivered & overdue
-			return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
+				return [__("Overdue"), "red",
-
+					"per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
-		} else if (doc.order_type !== "Maintenance"
+			} else if (flt(doc.grand_total) === 0) {
-			&& flt(doc.per_delivered, 6) < 100 && doc.status !== "Closed") {
-			// not delivered
-
-			if (flt(doc.grand_total) === 0) {
 				// not delivered (zero-amount order)
-
 				return [__("To Deliver"), "orange",
 					"per_delivered,<,100|grand_total,=,0|status,!=,Closed"];
 			} else if (flt(doc.per_billed, 6) < 100) {
 				// not delivered & not billed
-
 				return [__("To Deliver and Bill"), "orange",
 					"per_delivered,<,100|per_billed,<,100|status,!=,Closed"];
 			} else {
 				// not billed
-
 				return [__("To Deliver"), "orange",
 					"per_delivered,<,100|per_billed,=,100|status,!=,Closed"];
 			}
-
+		} else if ((flt(doc.per_delivered, 6) === 100) && flt(doc.grand_total) !== 0
-		} else if ((flt(doc.per_delivered, 6) === 100)
+			&& flt(doc.per_billed, 6) < 100) {
-			&& flt(doc.grand_total) !== 0 && flt(doc.per_billed, 6) < 100 && doc.status !== "Closed") {
 			// to bill
-
+			return [__("To Bill"), "orange",
-			return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
+				"per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
-
+		} else if (doc.skip_delivery_note && flt(doc.per_billed, 6) < 100){
-		} else if ((flt(doc.per_delivered, 6) === 100)
+			return [__("To Bill"), "orange", "per_billed,<,100|status,!=,Closed"];
-			&& (flt(doc.grand_total) === 0 || flt(doc.per_billed, 6) == 100) && doc.status !== "Closed") {
-			return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"];
-
-		}else if (doc.order_type === "Maintenance" && flt(doc.per_delivered, 6) < 100 && doc.status !== "Closed"){
-
-			if(flt(doc.per_billed, 6) < 100 ){
-				return [__("To Deliver and Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
-			}else if(flt(doc.per_billed, 6) === 100){
-				return [__("To Deliver"), "orange", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"];
-			}
 		}
-
 	},
 	onload: function(listview) {
 		var method = "erpnext.selling.doctype.sales_order.sales_order.close_or_unclose_sales_orders";

erpnext/selling/doctype/sales_order_item/sales_order_item.json

@@ -149,6 +149,7 @@
   },
   {
    "columns": 2,
+   "depends_on": "eval: !parent.skip_delivery_note",
    "fieldname": "delivery_date",
    "fieldtype": "Date",
    "in_list_view": 1,
@@ -693,6 +694,7 @@
    "description": "For Production",
    "fieldname": "produced_qty",
    "fieldtype": "Float",
+   "hidden": 1,
    "label": "Produced Quantity",
    "oldfieldname": "produced_qty",
    "oldfieldtype": "Currency",
@@ -743,7 +745,7 @@
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-09-13 12:18:54.903107",
+ "modified": "2019-10-10 08:46:26.244823",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",

erpnext/selling/report/sales_analytics/sales_analytics.js

@@ -80,10 +80,14 @@ frappe.query_reports["Sales Analytics"] = {
 
 					var tree_type = frappe.query_report.filters[0].value;
 
-					if(tree_type == "Customer" || tree_type == "Item") {
+					if(tree_type == "Customer") {
 						row_values = data.slice(4,length-1).map(function (column) {
 							return column.content;
 						})
+					} else if (tree_type == "Item") {
+						row_values = data.slice(5,length-1).map(function (column) {
+							return column.content;
+						})
 					}
 					else {
 						row_values = data.slice(3,length-1).map(function (column) {

erpnext/selling/report/sales_analytics/sales_analytics.py

@@ -136,7 +136,7 @@ class Analytics(object):
 		if self.filters["value_quantity"] == 'Value':
 			value_field = 'base_amount'
 		else:
-			value_field = 'qty'
+			value_field = 'stock_qty'
 
 		self.entries = frappe.db.sql("""
 			select i.item_code as entity, i.item_name as entity_name, i.stock_uom, i.{value_field} as value_field, s.{date_field}
@@ -338,8 +338,10 @@ class Analytics(object):
 	def get_chart_data(self):
 		length = len(self.columns)
 
-		if self.filters.tree_type in ["Customer", "Supplier", "Item"]:
+		if self.filters.tree_type in ["Customer", "Supplier"]:
 			labels = [d.get("label") for d in self.columns[2:length - 1]]
+		elif self.filters.tree_type == "Item":
+			labels = [d.get("label") for d in self.columns[3:length - 1]]
 		else:
 			labels = [d.get("label") for d in self.columns[1:length - 1]]
 		self.chart = {

erpnext/setup/doctype/sales_partner/sales_partner.js

@@ -24,5 +24,11 @@ frappe.ui.form.on('Sales Partner', {
 				}
 			}
 		};
+	},
+	referral_code:function(frm){
+		if (frm.doc.referral_code) {
+			frm.doc.referral_code=frm.doc.referral_code.toUpperCase();
+			frm.refresh_field('referral_code');
+		}
 	}
 });

erpnext/setup/doctype/sales_partner/sales_partner.json

@@ -510,6 +510,73 @@
    "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": "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, 
@@ -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", 

erpnext/setup/setup_wizard/operations/install_fixtures.py

@@ -65,7 +65,7 @@ def install(country=None):
 		{'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'),

erpnext/shopping_cart/cart.py

@@ -537,3 +537,29 @@ def get_address_territory(address_name):
 
 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

erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json

@@ -275,6 +275,40 @@
      "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": "", 
+     "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,
@@ -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",

erpnext/stock/doctype/delivery_trip/delivery_trip.json

@@ -166,12 +166,11 @@
    "fieldname": "driver_address",
    "fieldtype": "Link",
    "label": "Driver Address",
-   "options": "Address",
+   "options": "Address"
-   "read_only": 1
   }
  ],
  "is_submittable": 1,
- "modified": "2019-07-18 16:38:44.112651",
+ "modified": "2019-09-27 15:43:01.975139",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Trip",

erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py

@@ -129,7 +129,7 @@ class LandedCostVoucher(Document):
 
 			# 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):

erpnext/stock/doctype/packed_item/packed_item.py

@@ -7,7 +7,6 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.utils import cstr, flt
 from erpnext.stock.get_item_details import get_item_details
-
 from frappe.model.document import Document
 
 class PackedItem(Document):
@@ -31,6 +30,10 @@ def get_bin_qty(item, warehouse):
 	return det and det[0] or frappe._dict()
 
 def update_packing_list_item(doc, packing_item_code, qty, main_item_row, description):
+	if doc.amended_from:
+		old_packed_items_map = get_old_packed_item_details(doc.packed_items)
+	else:
+		old_packed_items_map = False
 	item = get_packing_item_details(packing_item_code, doc.company)
 
 	# check if exists
@@ -52,21 +55,23 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, descrip
 	pi.qty = flt(qty)
 	if description and not pi.description:
 		pi.description = description
-	if not pi.warehouse:
+	if not pi.warehouse and not doc.amended_from:
 		pi.warehouse = (main_item_row.warehouse if ((doc.get('is_pos') or item.is_stock_item \
 			or not item.default_warehouse) and main_item_row.warehouse) else item.default_warehouse)
-
+	if not pi.batch_no and not doc.amended_from:
-	if not pi.batch_no:
 		pi.batch_no = cstr(main_item_row.get("batch_no"))
 	if not pi.target_warehouse:
 		pi.target_warehouse = main_item_row.get("target_warehouse")
 	bin = get_bin_qty(packing_item_code, pi.warehouse)
 	pi.actual_qty = flt(bin.get("actual_qty"))
 	pi.projected_qty = flt(bin.get("projected_qty"))
+	if old_packed_items_map:
+		pi.batch_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].batch_no
+		pi.serial_no = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].serial_no
+		pi.warehouse = old_packed_items_map.get((packing_item_code, main_item_row.item_code))[0].warehouse
 
 def make_packing_list(doc):
 	"""make packing list for Product Bundle item"""
-
 	if doc.get("_action") and doc._action == "update_after_submit": return
 
 	parent_items = []
@@ -113,3 +118,9 @@ def get_items_from_product_bundle(args):
 
 def on_doctype_update():
 	frappe.db.add_index("Packed Item", ["item_code", "warehouse"])
+
+def get_old_packed_item_details(old_packed_items):
+	old_packed_items_map = {}
+	for items in old_packed_items:
+		old_packed_items_map.setdefault((items.item_code ,items.parent_item), []).append(items.as_dict())
+	return old_packed_items_map

erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js

@@ -0,0 +1,91 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Quick Stock Balance', {
+
+	setup: (frm) => {
+		frm.set_query('item', () => {
+			if (!(frm.doc.warehouse && frm.doc.date)) {
+				frm.trigger('check_warehouse_and_date');
+			}
+		});
+	},
+
+	make_custom_stock_report_button: (frm) => {
+		if (frm.doc.item) {
+			frm.add_custom_button(__('Stock Balance Report'), () => {
+				frappe.set_route('query-report', 'Stock Balance',
+					{ 'item_code': frm.doc.item, 'warehouse': frm.doc.warehouse });
+			}).addClass("btn-primary");
+		}
+	},
+
+	refresh: (frm) => {
+		frm.disable_save();
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	check_warehouse_and_date: (frm) => {
+		frappe.msgprint(__('Please enter Warehouse and Date'));
+		frm.doc.item = '';
+		frm.refresh();
+	},
+
+	warehouse: (frm) => {
+		if (frm.doc.item || frm.doc.item_barcode) {
+			frm.trigger('get_stock_and_item_details');
+		}
+	},
+
+	date: (frm) => {
+		if (frm.doc.item || frm.doc.item_barcode) {
+			frm.trigger('get_stock_and_item_details');
+		}
+	},
+
+	item: (frm) => {
+		frappe.flags.last_updated_element = 'item';
+		frm.trigger('get_stock_and_item_details');
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	item_barcode: (frm) => {
+		frappe.flags.last_updated_element = 'item_barcode';
+		frm.trigger('get_stock_and_item_details');
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	get_stock_and_item_details: (frm) => {
+		if (!(frm.doc.warehouse && frm.doc.date)) {
+			frm.trigger('check_warehouse_and_date');
+		}
+		else if (frm.doc.item || frm.doc.item_barcode) {
+			let filters = {
+				warehouse: frm.doc.warehouse,
+				date: frm.doc.date,
+			};
+			if (frappe.flags.last_updated_element === 'item') {
+				filters = { ...filters, ...{ item: frm.doc.item }};
+			}
+			else {
+				filters = { ...filters, ...{ barcode: frm.doc.item_barcode }};
+			}
+			frappe.call({
+				method: 'erpnext.stock.doctype.quick_stock_balance.quick_stock_balance.get_stock_item_details',
+				args: filters,
+				callback: (r) => {
+					if (r.message) {
+						let fields = ['item', 'qty', 'value', 'image'];
+						if (!r.message['barcodes'].includes(frm.doc.item_barcode)) {
+							frm.doc.item_barcode = '';
+							frm.refresh();
+						}
+						fields.forEach(function (field) {
+							frm.set_value(field, r.message[field]);
+						});
+					}
+				}
+			});
+		}
+	}
+});

erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json

@@ -0,0 +1,137 @@
+{
+ "_comments": "[]",
+ "allow_copy": 1,
+ "creation": "2019-09-06 12:01:33.933063",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "warehouse",
+  "date",
+  "item_barcode",
+  "item",
+  "col_break",
+  "item_name",
+  "item_description",
+  "image",
+  "sec_break",
+  "qty",
+  "col_break2",
+  "value"
+ ],
+ "fields": [
+  {
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Warehouse",
+   "options": "Warehouse",
+   "reqd": 1
+  },
+  {
+   "fieldname": "item",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "reqd": 1
+  },
+  {
+   "fieldname": "col_break",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "item_barcode",
+   "fieldtype": "Data",
+   "label": "Item Barcode"
+  },
+  {
+   "fetch_from": "item.item_name",
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "label": "Item Name",
+   "read_only": 1
+  },
+  {
+   "default": "  ",
+   "fetch_from": "item.description",
+   "fieldname": "item_description",
+   "fieldtype": "Small Text",
+   "label": "Item Description",
+   "read_only": 1
+  },
+  {
+   "fieldname": "sec_break",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "label": "Available Quantity",
+   "read_only": 1
+  },
+  {
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "value",
+   "fieldtype": "Currency",
+   "label": "Stock Value",
+   "read_only": 1
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Image",
+   "label": "Image View",
+   "options": "image",
+   "print_hide": 1
+  },
+  {
+   "default": "Today",
+   "fieldname": "date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Date",
+   "reqd": 1
+  }
+ ],
+ "hide_toolbar": 1,
+ "issingle": 1,
+ "modified": "2019-10-04 21:59:48.597497",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Quick Stock Balance",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "Stock User",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "Stock Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from erpnext.stock.utils import get_stock_balance, get_stock_value_on
+
+class QuickStockBalance(Document):
+	pass
+
+@frappe.whitelist()
+def get_stock_item_details(warehouse, date, item=None, barcode=None):
+	out = {}
+	if barcode:
+		out["item"] = frappe.db.get_value(
+			"Item Barcode", filters={"barcode": barcode}, fieldname=["parent"])
+		if not out["item"]:
+			frappe.throw(
+				_("Invalid Barcode. There is no Item attached to this barcode."))
+	else:
+		out["item"] = item
+
+	barcodes = frappe.db.get_values("Item Barcode", filters={"parent": out["item"]},
+		fieldname=["barcode"])
+
+	out["barcodes"] = [x[0] for x in barcodes]
+	out["qty"] = get_stock_balance(out["item"], warehouse, date)
+	out["value"] = get_stock_value_on(warehouse, date, out["item"])
+	out["image"] = frappe.db.get_value("Item",
+		filters={"name": out["item"]}, fieldname=["image"])
+	return out

erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py

@@ -24,7 +24,7 @@ def execute(filters=None):
 
 	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_item_info(filters):
 
 
 def get_consumed_items(condition):
-	cn_items = frappe.db.sql("""select se_item.item_code,
+	consumed_items = frappe.db.sql("""
-			sum(se_item.transfer_qty) as 'consume_qty'
+		select item_code, abs(sum(actual_qty)) as consumed_qty
-		from `tabStock Entry` se, `tabStock Entry Detail` se_item
+		from `tabStock Ledger Entry`
-		where se.name = se_item.parent and se.docstatus = 1
+		where actual_qty < 0
-		and (ifnull(se_item.t_warehouse, '') = '' or se.purpose = 'Send to Subcontractor') %s
+			and voucher_type not in ('Delivery Note', 'Sales Invoice')
-		group by se_item.item_code""" % (condition), as_dict=1)
+			%s
+		group by item_code
+	""" % condition, as_dict=1)
 
-	cn_items_map = {}
+	consumed_items_map = {}
-	for item in cn_items:
+	for item in consumed_items:
-		cn_items_map.setdefault(item.item_code, item.consume_qty)
+		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

erpnext/stock/report/stock_balance/stock_balance.py

@@ -39,6 +39,9 @@ def execute(filters=None):
 
 	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 @@ def execute(filters=None):
 					'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])

erpnext/support/doctype/issue/issue.py

@@ -22,6 +22,7 @@ class Issue(Document):
 		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
 

erpnext/templates/includes/cart.js

@@ -20,6 +20,7 @@ $.extend(shopping_cart, {
 		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 @@ $.extend(shopping_cart, {
 				}
 			}
 		});
+	},
+
+	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();
+				}
+			}
+		});
 	}
 });
 

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 @@ frappe.ready(() => {
 				{
 					label: __('Country'),
 					fieldname: 'country',
-					fieldtype: 'Data',
+					fieldtype: 'Link',
 					reqd: 1
 				},
 			],

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") }}

erpnext/templates/includes/rfq/rfq_items.html

@@ -3,13 +3,13 @@
 {% for d in doc.items %}
 <div class="rfq-item">
 	<div class="row">
-		<div class="col-sm-5 col-xs-12" style="margin-bottom: 10px;margin-top: 5px;">
+		<div class="col-sm-5 col-12" style="margin-bottom: 10px;margin-top: 5px;">
 			{{ item_name_and_description(d, doc) }}
 		</div>
-		<!-- <div class="col-sm-2 col-xs-2" style="margin-bottom: 10px;">
+		<!-- <div class="col-sm-2 col-2" style="margin-bottom: 10px;">
 			<textarea type="text" style="margin-top: 5px;" class="input-with-feedback form-control rfq-offer_detail" ></textarea>
 		</div> -->
-		<div class="col-sm-2 col-xs-4 text-right">
+		<div class="col-sm-2 col-4 text-right">
 				<input type="text" class="form-control text-right rfq-qty" style="margin-top: 5px;display: inline-block"
 				value = "{{ d.get_formatted('qty') }}"
 				data-idx="{{ d.idx }}">
@@ -17,14 +17,14 @@
 					{{_("UOM") + ":"+ d.uom}}
 				</p>
 		</div>
-		<div class="col-sm-2 col-xs-4 text-right">
+		<div class="col-sm-2 col-4 text-right">
 			<input type="text" class="form-control text-right rfq-rate"
 				style="margin-top: 5px;display: inline-block" value="0.00"
 				data-idx="{{ d.idx }}">
 		</div>
-        <div class="col-sm-3 col-xs-4 text-right" style="padding-top: 9px;">
+        <div class="col-sm-3 col-4 text-right" style="padding-top: 9px;">
            {{doc.currency_symbol}} <span class="rfq-amount" data-idx="{{ d.idx }}">0.00</span>
         </div>
 		</div>
 	</div>
-{% endfor %}
+{% endfor %}

erpnext/templates/includes/rfq/rfq_macros.html

@@ -1,13 +1,11 @@
-{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+{% from "erpnext/templates/includes/macros.html" import product_image_square, product_image %}
 
 {% macro item_name_and_description(d, doc) %}
     <div class="row">
-        <div class="col-xs-4 col-sm-2 order-image-col">
+        <div class="col-3">
-            <div class="order-image">
+			{{ product_image(d.image) }}
-                {{ product_image_square(d.image) }}
-            </div>
         </div>
-        <div class="col-xs-8 col-sm-10">
+        <div class="col-9">
             {{ d.item_code }}
             <p class="text-muted small">{{ d.description }}</p>
 			{% set supplier_part_no = frappe.db.get_value("Item Supplier", {'parent': d.item_code, 'supplier': doc.supplier}, "supplier_part_no") %}

erpnext/templates/includes/transaction_row.html

@@ -1,22 +1,21 @@
 <div class="web-list-item transaction-list-item">
-	<a href="/{{ pathname }}/{{ doc.name }}">
+	<div class="row">
-		<div class="row">
+		<div class="col-sm-4">
-			<div class="col-sm-4" style='margin-top: -3px;'>
+			<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
-				<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
+			{{ doc.name }}</span>
-				{{ doc.name }}</span>
+			<div class="small text-muted transaction-time"
-				<div class="small text-muted transaction-time"
+				title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
-					title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
+				{{ frappe.utils.global_date_format(doc.modified) }}
-					{{ frappe.utils.global_date_format(doc.modified) }}
-				</div>
-			</div>
-			<div class="col-sm-5">
-				<div class="small text-muted items-preview ellipsis ellipsis-width">
-					{{ doc.items_preview }}
-				</div>
-			</div>
-			<div class="col-sm-3 text-right bold">
-				{{ doc.get_formatted("grand_total") }}
 			</div>
 		</div>
-	</a>
+		<div class="col-sm-5">
+			<div class="small text-muted items-preview ellipsis ellipsis-width">
+				{{ doc.items_preview }}
+			</div>
+		</div>
+		<div class="col-sm-3 text-right bold">
+			{{ doc.get_formatted("grand_total") }}
+		</div>
+	</div>
+	<a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a>
 </div>

erpnext/templates/pages/order.html

@@ -12,7 +12,22 @@
 {% endblock %}
 
 {% block header_actions %}
-<a href='/printview?doctype={{ doc.doctype}}&name={{ doc.name }}&format={{ print_format }}' target="_blank" rel="noopener noreferrer">{{ _("Print") }}</a>
+<div class="dropdown">
+	<button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+		<span>{{ _('Actions') }}</span>
+		<b class="caret"></b>
+	</button>
+	<ul class="dropdown-menu dropdown-menu-right" role="menu">
+		{% if doc.doctype == 'Purchase Order' %}
+		<a class="dropdown-item" href="/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice_from_portal?purchase_order_name={{ doc.name }}" data-action="make_purchase_invoice">{{ _("Make Purchase Invoice") }}</a>
+		{% endif %}
+		<a class="dropdown-item" href='/printview?doctype={{ doc.doctype}}&name={{ doc.name }}&format={{ print_format }}'
+			target="_blank" rel="noopener noreferrer">
+			{{ _("Print") }}
+		</a>
+	</ul>
+</div>
+
 {% endblock %}
 
 {% block page_content %}
@@ -34,7 +49,7 @@
 </div>
 
 <p class="small my-3">
-	{%- set party_name = doc.supplier_name if doc.doctype == 'Supplier Quotation' else doc.customer_name %}
+	{%- set party_name = doc.supplier_name if doc.doctype in ['Supplier Quotation', 'Purchase Invoice', 'Purchase Order'] else doc.customer_name %}
 	<b>{{ party_name }}</b>
 
 	{% if doc.contact_display and doc.contact_display != party_name %}
@@ -172,4 +187,4 @@
 			currency: '{{ doc.currency }}'
 		}
 	</script>
-{% endblock %}
+{% endblock %}

erpnext/templates/pages/order.js

@@ -5,7 +5,9 @@ frappe.ready(function(){
 
 	var loyalty_points_input = document.getElementById("loyalty-point-to-redeem");
 	var loyalty_points_status = document.getElementById("loyalty-points-status");
-	loyalty_points_input.onblur = apply_loyalty_points;
+	if (loyalty_points_input) {
+		loyalty_points_input.onblur = apply_loyalty_points;
+	}
 
 	function apply_loyalty_points() {
 		var loyalty_points = parseInt(loyalty_points_input.value);
@@ -37,4 +39,4 @@ frappe.ready(function(){
 			});
 		}
 	}
-})
+})

erpnext/templates/pages/rfq.html

@@ -22,10 +22,10 @@
 
 {% block page_content %}
 <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
         <div class="rfq-supplier">{{ doc.supplier }}</div>
 	</div>
-    <div class="col-xs-6 text-muted text-right h6">
+    <div class="col-6 text-muted text-right h6">
         {{ doc.get_formatted("transaction_date") }}
     </div>
 </div>
@@ -33,16 +33,16 @@
 	<div id="order-container">
 			<div id="rfq-items">
 				<div class="row cart-item-header">
-					<div class="col-sm-5 col-xs-12">
+					<div class="col-sm-5 col-12">
 						{{ _("Items") }}
 					</div>
-					<div class="col-sm-2 col-xs-4 text-right">
+					<div class="col-sm-2 col-4 text-right">
 						{{ _("Qty") }}
 					</div>
-					<div class="col-sm-2 col-xs-4 text-right">
+					<div class="col-sm-2 col-4 text-right">
 						{{ _("Rate") }}
 					</div>
-					<div class="col-sm-3 col-xs-4 text-right">
+					<div class="col-sm-3 col-4 text-right">
 						{{ _("Amount") }}
 					</div>
 				</div>
@@ -55,30 +55,29 @@
 		</div>
         {% if doc.items %}
 		<div class="row grand-total-row">
-			<div class="col-xs-9 text-right">{{ _("Grand Total") }}</div>
+			<div class="col-9 text-right">{{ _("Grand Total") }}</div>
-			<div class="col-xs-3 text-right">
+			<div class="col-3 text-right">
 			{{doc.currency_symbol}}  <span class="tax-grand-total">0.0</span>
 			</div>
 		</div>
         {% endif %}
 		<div class="row terms">
-			<div class="col-xs-6">
+			<div class="col-6">
 				<br><br>
 				<p class="text-muted small">{{ _("Notes: ") }}</p>
 				<textarea class="form-control terms-feedback" style="height: 100px;"></textarea>
 			</div>
 		</div>
-		<hr>
+		<div class="row mt-5">
-		<div class="row">
+			<div class="col-12">
-			<div class="result">
+				<p class="text-muted small">{{ _("Quotations: ") }}</p>
-				<div class="col-xs-12">
+				{% if doc.rfq_links %}
-					<p class="text-muted small">{{ _("Quotations: ") }}</p>
+					<div class="result">
-					{% if doc.rfq_links %}
 						{% for d in doc.rfq_links %}
 							<div class="web-list-item transaction-list-item quotations" idx="{{d.name}}">
 								<div class="row">
 									<div class="col-sm-6">
-										<span class="indicator darkgrey"><a href="/quotations/{{d.name}}">{{d.name}}</a></span>
+										<span class="indicator darkgrey">{{d.name}}</span>
 									</div>
 									<div class="col-sm-3">
 										<span class="small darkgrey">{{d.status}}</span>
@@ -87,10 +86,11 @@
 										<span class="small darkgrey">{{d.transaction_date}}</span>
 									</div>
 								</div>
+								<a class="transaction-item-link" href="/quotations/{{d.name}}">Link</a>
 							</div>
 						{% endfor %}
-					{% endif %}
+					</div>
-				</div>
+				{% endif %}
 			</div>
 		</div>
     </div>

erpnext/translations/af.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,Belasting Tipe
 ,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 'n agtergrondtaak. In die geval dat daar probleme met die verwerking van die agtergrond is, sal die stelsel '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 @@ DocType: Asset Settings,Asset Settings,Bate instellings
 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 > Item Group > Brand,Itemkode> Itemgroep> 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: Healthcare Practitioner,Practitioner Schedules,Praktisynskedules
 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 @@ DocType: Currency Exchange,For Selling,Vir verkoop
 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: Request for Quotation,Message for Supplier,Boodskap vir Verskaffer
 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: Sales Invoice,Total Commission,Totale Kommissie
 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: Sales Invoice,Shipping Bill Date,Versending wetsontwerp Datum
 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: Request for Quotation,For individual supplier,Vir individuele verskaffe
 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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1818,6 +1825,7 @@ DocType: Holiday List,Holiday List Name,Vakansie Lys Naam
 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 @@ DocType: Program Enrollment,Transportation,Vervoer
 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/config/help.py,Setting up Employees,Opstel van werknemers
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,U prod
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Maksimum Voordele (J
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Laat selfinskrywings toe
 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: Salary Slip,Loan repayment,Lening terugbetaling
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besoek die forum
 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 @@ DocType: Vehicle,Fuel Type,Brandstoftipe
 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 @@ DocType: Student Admission Program,Application Fee,Aansoek fooi
 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: HR Settings,Leave Approval Notification Template,Verlaat goedkeuringske
 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 @@ DocType: Item Price,Packing Unit,Verpakkingseenheid
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
 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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Kl
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Waardasietempo
 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 @@ DocType: Department,Expense Approver,Uitgawe Goedkeuring
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Lab Te
 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 @@ DocType: Currency Exchange,For Buying,Vir koop
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,By die indiening van bestellings
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Voeg alle verskaffers by
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ry # {0}: Toegewysde bedrag kan nie groter wees as die uitstaande bedrag nie.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Klantegroep&gt; Gebied
 DocType: Tally Migration,Parties,partye
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Blaai deur BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Beveiligde Lenings
@@ -5091,7 +5112,6 @@ DocType: Subscription,Past Due Date,Verlede Vervaldatum
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,Assesseringsplan
 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 @@ DocType: Certification Application,Payment Details,Betaling besonderhede
 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 @@ DocType: Woocommerce Settings,API consumer key,API verbruikers sleutel
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Bron dokument naam
 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 @@ DocType: Lab Prescription,Test Code,Toets Kode
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Kies f
 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 @@ DocType: Contract,Party User,Party gebruiker
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,kommissie
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,V
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Skep &#39;n ontbreke
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,Maksimum Bedrag
 ,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: Academic Term,Term End Date,Termyn Einddatum
 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

erpnext/translations/am.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,የግብር አይነት
 ,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 @@ DocType: Asset Settings,Asset Settings,የቋሚ ቅንጅቶች
 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 > Item Group > Brand,የንጥል ኮድ> የንጥል ቡድን> የምርት ስም
 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: Healthcare Practitioner,Practitioner Schedules,የልምድ መርሐ
 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 @@ DocType: Currency Exchange,For Selling,ለሽያጭ
 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: Request for Quotation,Message for Supplier,አቅራቢ ለ መልዕ
 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: Sales Invoice,Total Commission,ጠቅላላ ኮሚሽን
 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: Sales Invoice,Shipping Bill Date,የማጓጓዣ ክፍያ ቀን
 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: Request for Quotation,For individual supplier,ግለሰብ አቅራቢ
 DocType: BOM Operation,Base Hour Rate(Company Currency),የመሠረት ሰዓት ተመን (የኩባንያ የምንዛሬ)
 ,Qty To Be Billed,እንዲከፍሉ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ደርሷል መጠን
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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} ውስጥ ያዘጋጁ
@@ -1816,6 +1823,7 @@ DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
 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 @@ DocType: Program Enrollment,Transportation,መጓጓዣ
 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/config/help.py,Setting up Employees,ሰራተኞች በማ
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,የእ
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),ከፍተኛ ጥቅ
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,ራስ ምዝገባን ይፍቀዱ ፡፡
 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: Salary Slip,Loan repayment,ብድር ብድር መክፈል
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,መድረኮች
 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 @@ 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/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 @@ DocType: Student Admission Program,Application Fee,የመተግበሪያ ክፍ
 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: HR Settings,Leave Approval Notification Template,የአፈፃፀም ማ
 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 @@ DocType: Item Price,Packing Unit,ማሸጊያ መለኪያ
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
 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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,ግምቱ ተመን
 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 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Ad
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,የቤ
 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 @@ DocType: Currency Exchange,For Buying,ለግዢ
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,የግcha ትዕዛዝ ማቅረቢያ ላይ።
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ሁሉንም አቅራቢዎች አክል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,የረድፍ # {0}: የተመደበ መጠን የላቀ መጠን የበለጠ ሊሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ክልል።
 DocType: Tally Migration,Parties,ፓርቲዎች ፡፡
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,አስስ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
@@ -5085,7 +5106,6 @@ DocType: Subscription,Past Due Date,ያለፈ ጊዜ ያለፈበት ቀን
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,ግምገማ ዕቅድ
 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 @@ DocType: Certification Application,Payment Details,የክፍያ ዝርዝሮች
 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 @@ DocType: Woocommerce Settings,API consumer key,የኤ ፒ አይ ተጠቃሚ
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,ምንጭ ሰነድ ስም
 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 @@ DocType: Lab Prescription,Test Code,የሙከራ ኮድ
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,በጀ
 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 @@ DocType: Contract,Party User,የጭፈራ ተጠቃሚ
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,ኮሚሽን
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,ያመለጠውን
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,ከፍተኛ ብቃቱ ብ
 ,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: Academic Term,Term End Date,የሚለው ቃል መጨረሻ ቀን
 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,እንደገና ለመሰየም።

erpnext/translations/ar.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,نوع الضريبة
 ,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 @@ DocType: Asset Settings,Asset Settings,إعدادات الأصول
 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 > Item Group > Brand,كود الصنف> مجموعة الصنف> العلامة التجارية
 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: Healthcare Practitioner,Practitioner Schedules,جداول الممار
 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 @@ DocType: Currency Exchange,For Selling,للبيع
 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: Request for Quotation,Message for Supplier,رسالة لمزود
 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: Sales Invoice,Total Commission,مجموع العمولة
 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: Sales Invoice,Shipping Bill Date,تاريخ فاتورة الشحن
 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: Request for Quotation,For individual supplier,عن مورد فردي
 DocType: BOM Operation,Base Hour Rate(Company Currency),سعر الساعة الأساسي (عملة الشركة)
 ,Qty To Be Billed,الكمية المطلوب دفعها
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,القيمة التي تم تسليمها
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1837,6 +1844,7 @@ DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
 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 @@ DocType: Program Enrollment,Transportation,النقل
 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/config/help.py,Setting up Employees,إعداد الموظف
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,الم
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),أقصى الفوا
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,السماح للالتحاق الذاتي
 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: Salary Slip,Loan repayment,سداد القروض
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,زيارة ال
 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 @@ 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/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 @@ DocType: Student Admission Program,Application Fee,رسوم الإستمارة
 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: HR Settings,Leave Approval Notification Template,اترك قالب إع
 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 @@ DocType: Item Price,Packing Unit,وحدة التعبئة
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
  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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,ا
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,معدل التقييم
 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 @@ DocType: Department,Expense Approver,معتمد النفقات
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,الت
 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 @@ DocType: Currency Exchange,For Buying,للشراء
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,عند تقديم طلب الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,إضافة جميع الموردين
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Tally Migration,Parties,حفلات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,تصفح قائمة المواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,القروض المضمونة
@@ -5145,7 +5166,6 @@ DocType: Subscription,Past Due Date,تاريخ الاستحقاق السابق
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,خطة التقييم
 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 @@ DocType: Certification Application,Payment Details,تفاصيل الدفع
 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 @@ DocType: Woocommerce Settings,API consumer key,مفتاح مستخدم API
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,اسم المستند المصدر
 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 @@ DocType: Lab Prescription,Test Code,رمز الاختبار
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,اخت
 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 @@ DocType: Contract,Party User,مستخدم الحزب
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,عمولة
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,إنشاء طرف م
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,أقصى مبلغ مؤهل
 ,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: Academic Term,Term End Date,تاريخ انتهاء الشرط
 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,لإعادة تسمية

erpnext/translations/bg.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,Данъчна тип
 ,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 @@ DocType: Asset Settings,Asset Settings,Настройки на активите
 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 > Item Group > Brand,Код на артикула> Група артикули> Марка
 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: Healthcare Practitioner,Practitioner Schedules,Практически
 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 @@ DocType: Currency Exchange,For Selling,За продажба
 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: Request for Quotation,Message for Supplier,Съобщение за до
 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: Sales Invoice,Total Commission,Общо комисионна
 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: Sales Invoice,Shipping Bill Date,Доставка на сметката
 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: Request for Quotation,For individual supplier,За отделен до
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базова цена на час (Валута на компанията)
 ,Qty To Be Billed,"Количество, за да бъдете таксувани"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Доставени Сума
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1818,6 +1825,7 @@ DocType: Holiday List,Holiday List Name,Име на списък на празн
 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 @@ DocType: Program Enrollment,Transportation,Транспорт
 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/config/help.py,Setting up Employees,Създаване Сл
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Ваш
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Максимални
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Разрешаване на самореги
 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: Salary Slip,Loan repayment,Погасяване на кредита
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Посетете
 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 @@ 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/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 @@ DocType: Student Admission Program,Application Fee,Такса за кандид
 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: HR Settings,Leave Approval Notification Template,Оставете ша
 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 @@ DocType: Item Price,Packing Unit,Опаковъчно устройство
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
 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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Ц
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Оценка Оценка
 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 @@ DocType: Department,Expense Approver,Expense одобряващ
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Лаб
 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 @@ DocType: Currency Exchange,For Buying,За покупка
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,При подаване на поръчка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Добавете всички доставчици
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Разпределената сума не може да бъде по-голяма от остатъка.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 DocType: Tally Migration,Parties,страни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Разгледай BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Обезпечени кредити
@@ -5092,7 +5113,6 @@ DocType: Subscription,Past Due Date,Изтекъл срок
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,План за оценка
 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 @@ DocType: Certification Application,Payment Details,Подробности на
 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 @@ DocType: Woocommerce Settings,API consumer key,Потребителски клю
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Име на изходния докумен
 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 @@ DocType: Lab Prescription,Test Code,Тестов код
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Изб
 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 @@ DocType: Contract,Party User,Потребител на партия
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,Комисионна
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Създайте л
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,"Максимална сум
 ,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: Academic Term,Term End Date,Условия - Крайна дата
 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,За преименуване

erpnext/translations/bn.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
 ,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 @@ DocType: Asset Settings,Asset Settings,সম্পদ সেটিংস
 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 > Item Group > Brand,আইটেম কোড> আইটেম গ্রুপ> ব্র্যান্ড
 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: Healthcare Practitioner,Practitioner Schedules,প্র্যাকট
 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 @@ DocType: Currency Exchange,For Selling,বিক্রয় জন্য
 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: Request for Quotation,Message for Supplier,সরবরাহকার
 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: Sales Invoice,Total Commission,মোট কমিশন
 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: Sales Invoice,Shipping Bill Date,শপিং বিল ডেট
 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: Request for Quotation,For individual supplier,পৃথক সরবর
 DocType: BOM Operation,Base Hour Rate(Company Currency),বেজ কেয়ামত হার (কোম্পানির মুদ্রা)
 ,Qty To Be Billed,কিটি টু বি বিল!
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,বিতরিত পরিমাণ
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1799,6 +1806,7 @@ DocType: Holiday List,Holiday List Name,ছুটির তালিকা ন
 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 @@ DocType: Program Enrollment,Transportation,পরিবহন
 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/config/help.py,Setting up Employees,এমপ্লয়
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,আপ
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),সর্বোচ
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,স্ব তালিকাভুক্ত
 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: Salary Slip,Loan repayment,ঋণ পরিশোধ
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,ফোরাম
 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: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock av
 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 @@ DocType: Student Admission Program,Application Fee,আবেদন ফী
 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: HR Settings,Leave Approval Notification Template,অনুমোদন
 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 @@ DocType: Item Price,Packing Unit,প্যাকিং ইউনিট
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
 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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,মূল্যনির্ধা
 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 @@ apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Ad
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,ল্
 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 @@ DocType: Currency Exchange,For Buying,কেনার জন্য
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ক্রয় আদেশ জমা দেওয়ার সময়
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,সমস্ত সরবরাহকারী যোগ করুন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,সারি # {0}: বরাদ্দ বকেয়া পরিমাণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না।
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 DocType: Tally Migration,Parties,দল
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,নিরাপদ ঋণ
@@ -5035,7 +5055,6 @@ DocType: Subscription,Past Due Date,অতীত তারিখের তার
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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/education/report/student_and_guardian_contact_details/stude
 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: Assessment Plan,Assessment Plan,অ্যাসেসমেন্ট
 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/assets/doctype/asset/asset.py,Gross Purchase Amount is mand
 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 @@ DocType: Certification Application,Payment Details,অর্থ প্রদা
 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 @@ DocType: Woocommerce Settings,API consumer key,এপিআই ভোক্ত
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,উত্স দস্তাবেজের
 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 @@ DocType: Lab Prescription,Test Code,পরীক্ষার কোড
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_
 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/public/js/account_tree_grid.js,Select Fiscal Year...,ফি
 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 @@ DocType: Contract,Party User,পার্টি ব্যবহারকার
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,কমিশন
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,নিখোঁজ
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,সর্বোচ্চ প
 ,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: Academic Term,Term End Date,টার্ম শেষ তারিখ
 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,নতুন নামকরণ

erpnext/translations/bs.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,Vrste poreza
 ,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 @@ DocType: Asset Settings,Asset Settings,Postavke sredstva
 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 > Item Group > Brand,Kod artikla> Grupa artikala> 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: Healthcare Practitioner,Practitioner Schedules,Raspored lekara
 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 @@ DocType: Currency Exchange,For Selling,Za prodaju
 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: Request for Quotation,Message for Supplier,Poruka za dobavljača
 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: Sales Invoice,Total Commission,Ukupno komisija
 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: Sales Invoice,Shipping Bill Date,Datum isporuke
 DocType: Production Plan,Production Plan,Plan proizvodnje
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otvaranje alata za kreiranje fakture
 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: Request for Quotation,For individual supplier,Za pojedinačne dobavlja
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company Valuta)
 ,Qty To Be Billed,Količina za naplatu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Isporučena Iznos
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1837,6 +1844,7 @@ DocType: Holiday List,Holiday List Name,Naziv liste odmora
 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 @@ DocType: Program Enrollment,Transportation,Prevoznik
 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/config/help.py,Setting up Employees,Postavljanje Zaposlenih
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Vaši
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Maksimalne prednosti
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Dozvoli samoostvarivanje
 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: Salary Slip,Loan repayment,otplata kredita
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Posjetite forum
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
 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 @@ DocType: Vehicle,Fuel Type,Vrsta goriva
 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 @@ DocType: Student Admission Program,Application Fee,naknada aplikacija
 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: HR Settings,Leave Approval Notification Template,Napustite šablon za u
 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 @@ DocType: Item Price,Packing Unit,Jedinica za pakovanje
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
  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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Bo
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Vrednovanje Stopa
 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 @@ DocType: Department,Expense Approver,Rashodi Approver
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Lab Te
 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 @@ DocType: Currency Exchange,For Buying,Za kupovinu
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Prilikom narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodajte sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: dodijeljeni iznos ne može biti veći od preostalog iznosa.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 DocType: Tally Migration,Parties,Stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,osigurani krediti
@@ -5143,7 +5164,6 @@ DocType: Subscription,Past Due Date,Datum prošlosti
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,plan procjene
 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 @@ DocType: Certification Application,Payment Details,Detalji plaćanja
 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 @@ DocType: Woocommerce Settings,API consumer key,API korisnički ključ
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Izvor Document Name
 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 @@ DocType: Lab Prescription,Test Code,Test Code
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Odaber
 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 @@ DocType: Contract,Party User,Party User
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,Provizija
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,R
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Napravite Missing Pa
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,Maksimalni iznos kvalifikova
 ,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: Academic Term,Term End Date,Term Završni datum
 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

erpnext/translations/ca.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 DocType: Delivery Trip,MAT-DT-.YYYY.-,MAT-DT-.YYYY.-
 DocType: Purchase Order,Customer Contact,Client Contacte
 DocType: Shift Type,Enable Auto Attendance,Activa l'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'oportunitat
 DocType: Patient Appointment,Check availability,Comprova disponibilitat
 DocType: Retention Bonus,Bonus Payment Date,Data de pagament addicional
@@ -265,6 +266,7 @@ DocType: Tax Rule,Tax Type,Tipus d'Impostos
 ,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'error d'aquesta reconciliació d'existències i tornarà a la fase d'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'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 @@ DocType: Asset Settings,Asset Settings,Configuració d'actius
 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 > Item Group > Brand,Codi de l'article> Grup d'articles> 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: Healthcare Practitioner,Practitioner Schedules,Horaris professionals
 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 @@ DocType: Currency Exchange,For Selling,Per vendre
 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: Request for Quotation,Message for Supplier,Missatge per als Proveïdors
 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: Sales Invoice,Total Commission,Total Comissió
 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: Sales Invoice,Shipping Bill Date,Data de facturació d&#39;enviament
 DocType: Production Plan,Production Plan,Pla de producció
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Obrir l&#39;eina de creació de la factura
 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: Request for Quotation,For individual supplier,Per proveïdor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa bàsica d&#39;Hora (Companyia de divises)
 ,Qty To Be Billed,Quantitat per ser facturat
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Quantitat lliurada
+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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1837,6 +1844,7 @@ DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 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 @@ DocType: Program Enrollment,Transportation,Transports
 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/config/help.py,Setting up Employees,Configuració d&#39;Emp
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Els Pr
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Beneficis màxims (a
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Permetre la matrícula automàtica
 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: Salary Slip,Loan repayment,reemborsament dels préstecs
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visiteu els fòr
 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 @@ DocType: Vehicle,Fuel Type,Tipus de combustible
 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 @@ DocType: Student Admission Program,Application Fee,Taxa de sol·licitud
 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: HR Settings,Leave Approval Notification Template,Deixeu la plantilla de
 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 @@ DocType: Item Price,Packing Unit,Unitat d&#39;embalatge
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
  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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Co
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Tarifa de Valoració
 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 @@ DocType: Department,Expense Approver,Aprovador de despeses
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Prova
 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 @@ DocType: Currency Exchange,For Buying,Per a la compra
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Enviament de la comanda de compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Afegeix tots els proveïdors
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Tally Migration,Parties,Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Préstecs Garantits
@@ -5145,7 +5166,6 @@ DocType: Subscription,Past Due Date,Data vençuda
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,pla d&#39;avaluació
 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 @@ DocType: Certification Application,Payment Details,Detalls del pagament
 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 @@ DocType: Woocommerce Settings,API consumer key,Clau de consum de l&#39;API
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Font Nom del document
 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 @@ DocType: Lab Prescription,Test Code,Codi de prova
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Selecc
 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 @@ DocType: Contract,Party User,Usuari del partit
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,Comissió
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,S
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Crea partit desapare
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,Import màxim elegible
 ,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: Academic Term,Term End Date,Termini Data de finalització
 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

erpnext/translations/cs.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,Daňové Type
 ,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 @@ DocType: Asset Settings,Asset Settings,Nastavení aktiv
 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 > Item Group > Brand,Kód položky> Skupina položek> 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: Healthcare Practitioner,Practitioner Schedules,Pracovník plánuje
 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 @@ DocType: Currency Exchange,For Selling,Pro prodej
 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: Request for Quotation,Message for Supplier,Zpráva pro dodavatele
 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: Sales Invoice,Total Commission,Celkem Komise
 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: Sales Invoice,Shipping Bill Date,Přepravní účet
 DocType: Production Plan,Production Plan,Plán produkce
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Otevření nástroje pro vytváření faktur
 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: Request for Quotation,For individual supplier,Pro jednotlivé dodavatel
 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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1836,6 +1843,7 @@ DocType: Holiday List,Holiday List Name,Název seznamu dovolené
 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 @@ DocType: Program Enrollment,Transportation,Doprava
 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/config/help.py,Setting up Employees,Nastavení Zaměstnanci
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Vaše
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Maximální přínos
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Povolit vlastní registraci
 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: Salary Slip,Loan repayment,splácení úvěru
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Navštivte fóra
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
 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 @@ DocType: Vehicle,Fuel Type,Druh paliva
 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 @@ DocType: Student Admission Program,Application Fee,poplatek za podání žádost
 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: HR Settings,Leave Approval Notification Template,Ponechat šablonu ozn
 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 @@ DocType: Item Price,Packing Unit,Balení
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
  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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Ba
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Ocenění
 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 @@ DocType: Department,Expense Approver,Schvalovatel výdajů
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Labora
 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 @@ DocType: Currency Exchange,For Buying,Pro nákup
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Při zadávání objednávky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Přidat všechny dodavatele
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Řádek # {0}: Přidělená částka nesmí být vyšší než zůstatek.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Tally Migration,Parties,Strany
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Procházet kusovník
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Zajištěné úvěry
@@ -5144,7 +5165,6 @@ DocType: Subscription,Past Due Date,Datum splatnosti
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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/education/report/student_and_guardian_contact_details/stude
 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: Assessment Plan,Assessment Plan,Plan Assessment
 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 @@ DocType: Certification Application,Payment Details,Platební údaje
 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 @@ DocType: Woocommerce Settings,API consumer key,API spotřebitelský klíč
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Název zdrojového dokumentu
 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 @@ DocType: Lab Prescription,Test Code,Testovací kód
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Vybert
 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 @@ DocType: Contract,Party User,Party Uživatel
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,Provize
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,P
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Vytvořit chybějíc
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,Maximální částka je způ
 ,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: Academic Term,Term End Date,Termín Datum ukončení
 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

erpnext/translations/da.csv

@@ -46,6 +46,7 @@ DocType: Sales Taxes and Charges Template,* Will be calculated in the transactio
 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 @@ DocType: Tax Rule,Tax Type,Skat Type
 ,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 @@ DocType: Asset Settings,Asset Settings,Aktiver instilligner
 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 > Item Group > Brand,Varekode> Varegruppe> 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: Healthcare Practitioner,Practitioner Schedules,Practitioner Schedules
 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 @@ DocType: Currency Exchange,For Selling,Til salg
 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: Request for Quotation,Message for Supplier,Besked til leverandøren
 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: Sales Invoice,Total Commission,Samlet provision
 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: Sales Invoice,Shipping Bill Date,Fragtregningsdato
 DocType: Production Plan,Production Plan,Produktionsplan
 DocType: Opening Invoice Creation Tool,Opening Invoice Creation Tool,Åbning af fakturaoprettelsesværktøj
 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: Request for Quotation,For individual supplier,Til individuel leverandø
 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/hr/doctype/salary_structure/salary_structure.js,Preview Sal
 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}
@@ -1818,6 +1825,7 @@ DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
 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 @@ DocType: Program Enrollment,Transportation,Transport
 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/config/help.py,Setting up Employees,Opsætning af Medarbejd
 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 @@ apps/erpnext/erpnext/utilities/user_progress.py,Your Products or Services,Dine p
 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/manufacturing/doctype/work_order/work_order.js,Please set t
 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 @@ apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py,Sum of
 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: Employee Benefit Application,Max Benefits (Yearly),Maksimale fordele (
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"No active BOM f
 						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: Program,Allow Self Enroll,Tillad selvregistrering
 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: Salary Slip,Loan repayment,Tilbagebetaling af lån
 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: Item,"If this item has variants, then it cannot be selected in sales or
 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 @@ apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besøg fora
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
 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 @@ DocType: Vehicle,Fuel Type,Brændstofstype
 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 @@ DocType: Student Admission Program,Application Fee,Tilmeldingsgebyr
 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: HR Settings,Leave Approval Notification Template,Forlad godkendelsesska
 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 @@ DocType: Item Price,Packing Unit,Pakningsenhed
 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 @@ apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidat
 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 @@ Examples:
 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 @@ apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Colour,Fa
 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 @@ DocType: Purchase Invoice Item,Valuation Rate,Værdiansættelsesbeløb
 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 @@ DocType: Department,Expense Approver,Udlægsgodkender
 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 @@ apps/erpnext/erpnext/healthcare/doctype/lab_test/lab_test.py,Lab Test(s) ,Lab Te
 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 @@ DocType: Currency Exchange,For Buying,Til køb
 apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ved levering af indkøbsordre
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tilføj alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allokeret beløb kan ikke være større end udestående beløb.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tally Migration,Parties,parterne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Gennemse styklister
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Sikrede lån
@@ -5092,7 +5113,6 @@ DocType: Subscription,Past Due Date,Forfaldsdato
 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 @@ apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,
 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 @@ apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BO
 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: Assessment Plan,Assessment Plan,Vurdering Plan
 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 @@ DocType: Certification Application,Payment Details,Betalingsoplysninger
 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 @@ DocType: Woocommerce Settings,API consumer key,API forbrugernøgle
 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/selling/doctype/sales_order/sales_order.py,Delivery Notes {
 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 @@ apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_en
 ,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: Batch,Source Document Name,Kildedokumentnavn
 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 @@ DocType: Lab Prescription,Test Code,Testkode
 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 @@ apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py,Ro
 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 @@ apps/erpnext/erpnext/public/js/hub/pages/Item.vue,Why do think this Item should
 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 @@ apps/erpnext/erpnext/hr/doctype/job_offer/job_offer.py,There are no vacancies un
 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/public/js/account_tree_grid.js,Select Fiscal Year...,Vælg
 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 @@ DocType: Contract,Party User,Selskabs-bruger
 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: Education Settings,"For Course based Student Group, the Course will be
 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 @@ apps/erpnext/erpnext/assets/doctype/asset/asset.py,Opening Accumulated Depreciat
 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 @@ apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge with Existing Acc
 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 @@ DocType: Sales Invoice,Commission,Provision
 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/config/accounting.py,Tax Category for overriding tax rates.
 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 @@ apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Sales Person,S
 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 @@ DocType: Opening Invoice Creation Tool,Create Missing Party,Opret manglende Sels
 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 @@ DocType: Employee Benefit Claim,Max Amount Eligible,Maksimumsbeløb berettiget
 ,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: Academic Term,Term End Date,Betingelser slutdato
 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